Revision 27562

View differences:

branches/v2_0_0_prep/libraries/libjni-gdal/build.xml
1 1
<project name="Native Build System" default="native" basedir=".">
2 2

  
3 3
	<import file="../build/scripts/utilities.xml"/>
4
	<property name="localProductDir" value="${basedir}/target/target_cmake_product" />
4 5

  
5 6
	<target name="generate" >
6 7
		<cmake/>
......
34 35
		<buildman goal="update" args="--file depman-vs9.xml" />
35 36
	</target>
36 37
	
37
	<target name="deploy-native">
38
		<buildman goal="create" args="--file depman.xml" />
38
	<target name="deploy-native" if="useBuildMan" >
39
		<cmake args="-DCMAKE_INSTALL_PREFIX=${localProductDir}"/>
40
		<make-install numProc="${numProc}"/>
41
		<buildman goal="create" args="--from-xml depman.xml --path ${localProductDir}" />
39 42
	</target>
40
	<target name="deploy-vs7">
41
		<buildman goal="create" args="--file depman.xml" />
43
	<target name="deploy-vs7" if="isBuildMan" >
44
		<cmake args="-DCMAKE_INSTALL_PREFIX=target/target_cmake_product"/>
45
		<buildman goal="create" args="--from-xml depman-vs7.xml --path ${localProductDir}" />
46
		<make-install numProc="${numProc}"/>
42 47
	</target>
43
	<target name="deploy-vs9">
44
		<buildman goal="create" args="--file depman.xml" />
48
	<target name="deploy-vs9" if="isBuildMan" >
49
		<cmake args="-DCMAKE_INSTALL_PREFIX=${localProductDir}"/>
50
		<make-install numProc="${numProc}"/>
51
		<buildman goal="create" args="--from-xml depman-vs9.xml --path ${localProductDir}" />
45 52
	</target>
46 53
</project>
47 54

  
branches/v2_0_0_prep/libraries/libjni-gdal/CMakeLists.txt
40 40

  
41 41
CONFIGURE_DEFAULTS()
42 42

  
43
SET(CMAKE_INSTALL_PREFIX ${DEPMAN_PATH} CACHE STRING "Forcing install path" FORCE)
43
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
44
  SET(CMAKE_INSTALL_PREFIX
45
    ${DEPMAN_PATH} CACHE PATH "depman path install prefix" FORCE
46
    )
47
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
44 48

  
45 49
FIND_PACKAGE(JNI REQUIRED) 
46 50
FIND_PACKAGE(GDAL REQUIRED) 

Also available in: Unified diff