Revision 20060

View differences:

trunk/libraries/libjni-mrsid/src/main/native/jmrsid/CMakeLists.txt
1 1
set(LIB_NAME jmrsid)
2 2

  
3
#SET_SOURCE_FILES_PROPERTIES(${LIB_COMMON_FILES} PROPERTIES LANGUAGE CXX)
4
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR} PROPERTIES LANGUAGE CXX)
5
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR2} PROPERTIES LANGUAGE CXX)
6
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR3} PROPERTIES LANGUAGE CXX)
7
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR4} PROPERTIES LANGUAGE CXX)
8
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR5} PROPERTIES LANGUAGE CXX)
9
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR6} PROPERTIES LANGUAGE CXX)
10
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR7} PROPERTIES LANGUAGE CXX)
11
#SET_SOURCE_FILES_PROPERTIES(${MRSID_INCLUDE_DIR8} PROPERTIES LANGUAGE CXX)
12 3

  
13
#set(HEADER_PATH ${CMAKE_SOURCE_DIR}/include/${LIB_NAME})
14

  
15
SET(CMAKE_CXX_COMPILER /usr/bin/g++)
16

  
17 4
FILE(GLOB LIB_PUBLIC_HEADERS "${HEADER_PATH}/*.h")
18 5
FILE(GLOB LIB_COMMON_FILES "*.c*")
19 6
include_directories(
......
35 22
	${LIB_COMMON_FILES}
36 23
)
37 24

  
38
target_link_libraries(${LIB_NAME}
39
	${MRSID_LIBRARY}
40
)
25
IF(UNIX)
26
	target_link_libraries(${LIB_NAME}
27
		${MRSID_LIBRARY}
28
	)
29
ENDIF(UNIX)
41 30

  
31
IF(WIN32)
32
	target_link_libraries(${LIB_NAME}
33
		${MRSID_LIBRARY_W1}
34
		$(MRSID_LIBRARY_W2)
35
	)
36
ENDIF(WIN32)
42 37

  
43 38
if(APPLE)
44 39
SET_TARGET_PROPERTIES(${LIB_NAME}
......
48 43

  
49 44
INCLUDE(ModuleInstall OPTIONAL)
50 45

  
51
SET(CMAKE_CXX_COMPILER /usr/bin/g++)
52
SET(CMAKE_C_COMPILER /usr/bin/gcc)
53

  
54 46
SET_TARGET_PROPERTIES(jmrsid PROPERTIES VERSION "${JMRSID_VERSION}")
55 47
IF(UNIX)
56 48
	SET_TARGET_PROPERTIES(jmrsid PROPERTIES OUTPUT_NAME "jmrsid${VERSION}")
trunk/libraries/libjni-mrsid/CMakeModules/FindMRSID.cmake
10 10
# Created by Robert Osfield. 
11 11

  
12 12
FIND_PATH(MRSID_INCLUDE_DIR lti_image.h
13
	C:/Geo_DSDK-6.0.7.1408/include/base
13 14
	${CMAKE_SOURCE_DIR}/sdk/include/base
14 15
    ${MRSID_DIR}/include/base
15 16
    $ENV{MRSID_DIR}/include/base
16 17
)
17 18

  
18 19
FIND_PATH(MRSID_INCLUDE_DIR2 ltic_api.h
20
	C:/Geo_DSDK-6.0.7.1408/include/c_api
19 21
	${CMAKE_SOURCE_DIR}/sdk/include/c_api
20 22
    ${MRSID_DIR}/include/c_api
21 23
    $ENV{MRSID_DIR}/include/c_api
22 24
)
23 25

  
24 26
FIND_PATH(MRSID_INCLUDE_DIR3 lti_cropFilter.h
27
	C:/Geo_DSDK-6.0.7.1408/include/filters
25 28
    ${CMAKE_SOURCE_DIR}/sdk/include/filters
26 29
    #${MRSID_DIR}/include/filters
27 30
    #$ENV{MRSID_DIR}/include/filters
28 31
)
29 32

  
30 33
FIND_PATH(MRSID_INCLUDE_DIR4 j2k_types.h
34
    C:/Geo_DSDK-6.0.7.1408/include/j2k_readers
31 35
    ${CMAKE_SOURCE_DIR}/sdk/include/j2k_readers
32 36
    ${MRSID_DIR}/include/j2k_readers
33 37
    $ENV{MRSID_DIR}/include/j2k_readers
34 38
)
35 39

  
36 40
FIND_PATH(MRSID_INCLUDE_DIR5 lti_metadataUtils.h
41
    C:/Geo_DSDK-6.0.7.1408/include/metadata
37 42
    ${CMAKE_SOURCE_DIR}/sdk/include/metadata
38 43
    ${MRSID_DIR}/include/metadata
39 44
    $ENV{MRSID_DIR}/include/metadata
40 45
)
41 46

  
42 47
FIND_PATH(MRSID_INCLUDE_DIR6 lti_mrsidReadersStatus.h
48
	C:/Geo_DSDK-6.0.7.1408/include/mrsid_readers
43 49
    ${CMAKE_SOURCE_DIR}/sdk/include/mrsid_readers
44 50
    ${MRSID_DIR}/include/mrsid_readers
45 51
    $ENV{MRSID_DIR}/include/mrsid_readers
46 52
)
47 53

  
48 54
FIND_PATH(MRSID_INCLUDE_DIR7 lt_base.h
55
	C:/Geo_DSDK-6.0.7.1408/include/support
49 56
    ${CMAKE_SOURCE_DIR}/sdk/include/support
50 57
    ${MRSID_DIR}/include/support
51 58
    $ENV{MRSID_DIR}/include/support
52 59
)
53 60

  
54 61
FIND_PATH(MRSID_INCLUDE_DIR8 lti_writersStatus.h
62
	C:/Geo_DSDK-6.0.7.1408/include/writers
55 63
    ${CMAKE_SOURCE_DIR}/sdk/include/writers
56 64
    ${MRSID_DIR}/include/writers
57 65
    $ENV{MRSID_DIR}/include/writers
......
66 74
    $ENV{MRSID_DIR}/lib/Release
67 75
)
68 76

  
77
	
78
FIND_LIBRARY(MRSID_LIBRARY_W1
79
	NAMES lti_dsdk_dll
80
	PATHS
81
	C:/Geo_DSDK-6.0.7.1408/lib/Release
82
	${CMAKE_SOURCE_DIR}/sdk/lib
83
    ${MRSID_DIR}/lib/Release
84
    $ENV{MRSID_DIR}/lib/Release
85
)
69 86

  
87
FIND_LIBRARY(MRSID_LIBRARY_W2
88
NAMES lti_dsdk_	cdll
89
	PATHS
90
	C:/Geo_DSDK-6.0.7.1408/lib/Release
91
	${CMAKE_SOURCE_DIR}/sdk/lib
92
    ${MRSID_DIR}/lib/Release
93
    $ENV{MRSID_DIR}/lib/Release
94
)
95

  
70 96
SET(MRSID_FOUND "NO")
71 97
IF(MRSID_LIBRARY AND MRSID_INCLUDE_DIR)
72 98
    SET(MRSID_FOUND "YES")
trunk/libraries/libjni-mrsid/build.xml
43 43
			<arg line=".." />
44 44
			<arg line="-G${cmake_generator}" />
45 45
			<arg line="-DMRSID_DIR=${sdk-dir}" />
46
			<arg line="-DCMAKE_BUILD_TYPE=Debug" />
46
			<arg line="-DCMAKE_BUILD_TYPE=Release" />
47 47
			<arg line="-DJGDAL_VERSION=${jmrsid_version}" />
48 48
		</exec>
49 49
	</target>

Also available in: Unified diff