Changeset 152 for current/src/CMakeLists.txt

Timestamp:

02/20/10 16:26:58 (7 months ago)

Author:

reed

Message:

fixes for building on windows 7

File:

• current/src/CMakeLists.txt (modified) (3 diffs)

current/src/CMakeLists.txt

@@ -6 +6 @@
   "\"-DPACKAGE_STRING=\\\"${PROJ_NAME} ${PROJ_VERSION}\\\"\""
   "\"-DPACKAGE_BUGREPORT=\\\"${PROJ_EMAIL}\\\"\""
+  "-DBOOST_ALL_NO_LIB"
 )
 
@@ -20 +21 @@
   ADD_DEFINITIONS(-D_SCL_SECURE_NO_DEPRECATE)
   SET(CMAKE_C_FLAGS "${MY_C_FLAGS} /wd4100 /wd4101 /wd4189 /wd4706")
-  STRING(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-  STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-  STRING(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-  STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+  IF(USE_STATIC_LIBS)
+    STRING(REGEX REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+    STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+    STRING(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+    STRING(REGEX REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+  ENDIF(USE_STATIC_LIBS)
   
   # Use the highest warning level for visual studio.
@@ -50 +53 @@
   LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
   IF(NOT Boost_USE_STATIC_LIBS)
-    ADD_DEFINITIONS(-DBOOST_DYN_LINK)
+    ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK)
   ENDIF(NOT Boost_USE_STATIC_LIBS)
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${Boost_LIB_DIAGNOSTIC_DEFINITIONS}")