Changeset 303

Timestamp:

03/20/09 11:15:29 (16 years ago)

Author:

suzdalev

Message:

cmake mac Os X configuration

Files:

• CMakeLists.txt (modified) (3 diffs)
• CMake_modules/FindITPP.cmake (modified) (1 diff)
• bdm/libconfig/libconfig.c (modified) (1 diff)

CMakeLists.txt

@@ -24 +24 @@
         INCLUDE(\\win32\\local_paths.txt OPTIONAL)      
         ADD_DEFINITIONS(-DHAVE_ACML)
-ELSE()
+ENDIF(WIN32)
+IF(APPLE)
+        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\macosx\\itpp-4.0.6")
+        FIND_LIBRARY(FRAMEWORK_VECLIB vecLib)
+        ADD_DEFINITIONS(-DHAVE_XLOCALE_H)
+ENDIF(APPLE)
+IF(UNIX)
         #This is for UNIX makefile which does only one release at a time.
         SET(CMAKE_BUILD_TYPE Debug)
@@ -32 +38 @@
         #ADD_DEFINITIONS(-DNDEBUG)
         INCLUDE(CMakeLocal.txt OPTIONAL)        
-ENDIF(WIN32)
+ENDIF(UNIX)
 
 FIND_PACKAGE(ITPP REQUIRED)
@@ -54 +60 @@
 MACRO(EXEC FN)
         add_executable (${FN} ${FN}.cpp)
+        IF(WIN32)
                 target_link_libraries (${FN} debug itpp_debug)
                 target_link_libraries (${FN} optimized itpp)
-        IF(WIN32)
                 target_link_libraries (${FN} libacml_dll)
-#       ELSE(WIN32)
-#               target_link_libraries (${FN} itpp)      
+        ELSE(WIN32)
+                IF(APPLE)
+                        target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
+                ENDIF(APPLE)
+                target_link_libraries (${FN} itpp)      
         ENDIF(WIN32)
         target_link_libraries (${FN} bdm)

CMake_modules/FindITPP.cmake

@@ -18 +18 @@
 FIND_LIBRARY(ITPP_LIBRARY
   NAMES itpp itpp_debug
-  PATHS ${ITPP_DIR}/libs 
+  PATHS ${ITPP_DIR}/libs
+  ${ITPP_DIR}/itpp/.libs/
   "${ITPP_DIR}\\win32\\lib"
   /usr/pkgs64/lib

bdm/libconfig/libconfig.c

@@ -37 +37 @@
 #include <locale.h>
 
-#ifdef HAVE_XLOCALE_H
+#ifdef __APPLE__
 #include <xlocale.h>
 #endif