Skip to content
Browse files

Fix OSX build

  • Loading branch information...
1 parent 2bc15a4 commit 29408695b4a53a0faf7094b9862f7c04874a1de1 @pjotrp committed Jan 25, 2010
View
11 src/clibs/affyio-1.8/src/CMakeLists.txt
@@ -10,13 +10,15 @@ IF(NOT BUILD_LIBS)
SET (CMAKE_MODULE_PATH ${MAP_ROOT}/tools/cmake-support/modules)
ENDIF(NOT BUILD_LIBS)
+SET(USE_ZLIB TRUE)
+SET(USE_RLIB TRUE)
+
FIND_PACKAGE(Map REQUIRED)
-FIND_PACKAGE(RLibs REQUIRED)
-FIND_PACKAGE(ZLIB REQUIRED)
+FIND_PACKAGE(MapLibraries REQUIRED)
INCLUDE_DIRECTORIES(.)
-BUILD_CLIB()
+NAME_CLIB()
ADD_LIBRARY(${LIBNAME} SHARED
biolib_affyio.c
@@ -28,7 +30,6 @@ ADD_LIBRARY(${LIBNAME} SHARED
read_celfile_generic.c
)
-# ---- The following may be required for OSX
-TARGET_LINK_LIBRARIES(${LIBNAME} ${ZLIB_NAME})
+BUILD_CLIB()
INSTALL_CLIB()
View
11 src/clibs/biolib_R/src/CMakeLists.txt
@@ -12,16 +12,23 @@ IF(NOT BUILD_LIBS)
ENDIF(NOT IS_DIRECTORY ${CMAKE_MODULE_PATH})
ENDIF(NOT BUILD_LIBS)
+SET(USE_CORE TRUE)
+SET(USE_RLIB TRUE)
+
FIND_PACKAGE(Map)
+FIND_PACKAGE(MapLibraries)
+FIND_PACKAGE(Rlibs)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../build)
INCLUDE_DIRECTORIES(../include)
INCLUDE_DIRECTORIES(../../biolib_core/include)
-BUILD_CLIB()
SET(LIBNAME biolib_R-${MAP_VERSION}) # override
-
ADD_LIBRARY(${LIBNAME} SHARED biolib_R_map.c)
+BUILD_CLIB()
+
INSTALL_CLIB()
+
+
View
11 src/clibs/staden_io_lib/src/CMakeLists.txt
@@ -9,8 +9,10 @@ IF(NOT BUILD_LIBS)
SET (CMAKE_MODULE_PATH ${MAP_ROOT}/tools/cmake-support/modules)
ENDIF()
+SET(USE_ZLIB TRUE)
+
FIND_PACKAGE(Map REQUIRED)
-FIND_PACKAGE(ZLIB REQUIRED)
+FIND_PACKAGE(MapLibraries REQUIRED)
SET(CONTRIB_PATH ${MAP_ROOT}/contrib/${M_NAME})
SET(CONTRIB_SRC_PATH ${CONTRIB_PATH}/io_lib)
@@ -21,15 +23,12 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../build)
INCLUDE_DIRECTORIES(${CONTRIB_PATH})
-BUILD_CLIB()
+NAME_CLIB()
FILE(STRINGS files.txt CONTRIB_FILES)
-
ADD_LIBRARY(${LIBNAME} SHARED
${CONTRIB_FILES}
)
-# ---- The following may be required for OSX
-# TARGET_LINK_LIBRARIES(${LIBNAME} ${ZLIB_NAME})
-
+BUILD_CLIB()
INSTALL_CLIB()
2 tools/cmake-support
@@ -1 +1 @@
-Subproject commit 797feefeea02c3825b3745bc782248c292b4514d
+Subproject commit 448d6a2718a5d0814442d93c3cc43f85419ac141

0 comments on commit 2940869

Please sign in to comment.
Something went wrong with that request. Please try again.