Revision 31847

View differences:

branches/gvSIG_19_ext3D_osgVP_2_2_0/libraries/libjni-ecw/CMakeLists.txt
39 39
INCLUDE(GeneralMacros) 
40 40

  
41 41
CONFIGURE_DEFAULTS()
42

  
42
IF(APPLE)
43
	ADD_DEFINITIONS(-DMACOSX)
44
	ADD_DEFINITIONS(-DPOSIX)
45
ENDIF(APPLE)
43 46
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
44 47
  SET(CMAKE_INSTALL_PREFIX
45 48
    ${DEPMAN_PATH} CACHE PATH "depman path install prefix" FORCE
branches/gvSIG_19_ext3D_osgVP_2_2_0/libraries/libjni-ecw/src/main/native/jecw/ncsecwcompressclient_wrapper.c
51 51

  
52 52
#include <jni.h>
53 53
#include <string.h>
54
#ifdef __APPLE__
55
#include <stdlib.h>
56
#else
54 57
#include <malloc.h>
58
#endif
55 59
#include "NCSECWCompressClient.h"
56 60

  
57 61
typedef struct ReadInfo {
branches/gvSIG_19_ext3D_osgVP_2_2_0/libraries/libjni-ecw/CMakeModules/FindECW.cmake
29 29
)
30 30

  
31 31
FIND_LIBRARY(ECW_LIBRARY 
32
	NAMES libecwj2
32
	NAMES libecwj2 ecwj2
33 33
	PATHS
34 34
	${ECW_DIR}/lib
35 35
    $ENV{ECW_DIR}/lib
......
40 40
	SET(ECW_LIBRARIES ${ECW_LIBRARY})
41 41
ENDIF(ECW_LIBRARY)
42 42

  
43
IF(NOT ECW_LIBRARY)
44
	FIND_LIBRARY(ECW_LIBRARY 
43
IF(UNIX)
44
	FIND_LIBRARY(NECW_LIBRARY 
45 45
		NAMES NCSEcw
46 46
		PATHS
47 47
		${ECW_DIR}/lib
......
59 59
		/usr/freeware/lib64
60 60
	)
61 61

  
62
	IF(ECW_LIBRARY)
63
		SET(ECW_LIBRARIES ${ECW_LIBRARY})
64
	ENDIF(ECW_LIBRARY)
62
	IF(NECW_LIBRARY)
63
		SET(ECW_LIBRARIES ${NECW_LIBRARY})
64
	ENDIF(NECW_LIBRARY)
65 65

  
66 66
	FIND_LIBRARY(ECW_LIBRARY2 
67 67
		NAMES NCSEcwC
......
128 128
	IF(ECW_LIBRARY4)
129 129
		SET(ECW_LIBRARIES ${ECW_LIBRARIES} ${ECW_LIBRARY4})
130 130
	ENDIF(ECW_LIBRARY4)
131
ENDIF(NOT ECW_LIBRARY)
131
ENDIF(UNIX)
132 132

  
133 133
SET(ECW_FOUND "NO")
134 134
IF(ECW_LIBRARIES AND ECW_INCLUDE_DIR)

Also available in: Unified diff