Changeset 509

Timestamp:

08/12/09 16:55:18 (15 years ago)

Author:

smidl

Message:

split it++ debug/release even in Linux build for easier debugging

Location:

library/system

Files:

• FindITPP.cmake (modified) (1 diff)
• SetBdmEnv.cmake (modified) (2 diffs)

library/system/FindITPP.cmake

@@ -20 +20 @@
 FIND_LIBRARY(ITPP_LIBRARY
   NAMES itpp #itpp_debug
+  PATHS ${ITPP_DIR}/libs
+  ${ITPP_DIR}/itpp/.libs/
+  "${ITPP_DIR}\\win32\\lib"
+  /usr/pkgs64/lib
+  /usr/lib64
+  /usr/lib
+  /usr/local/lib
+  NO_DEFAULT_PATH
+)
+
+FIND_LIBRARY(ITPP_LIBRARY_DEBUG
+  NAMES itpp_debug
   PATHS ${ITPP_DIR}/libs
   ${ITPP_DIR}/itpp/.libs/

library/system/SetBdmEnv.cmake

@@ -91 +91 @@
                         target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
                 ENDIF(APPLE)
-                target_link_libraries (${FN} itpp)      
-#               target_link_libraries (${FN} debug itpp_debug)
-#               target_link_libraries (${FN} optimized itpp)
+                IF(ITPP_LIBRARY_DEBUG)
+                        target_link_libraries (${FN} debug itpp_debug)
+                        target_link_libraries (${FN} optimized itpp)
+                ELSE(ITPP_LIBRARY_DEBUG)
+                        target_link_libraries (${FN} itpp_debug)        
+                ENDIF(ITPP_LIBRARY_DEBUG)
         ENDIF(WIN32)
         target_link_libraries (${FN} bdm)
@@ -108 +111 @@
                         target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
                 ENDIF(APPLE)
-                target_link_libraries (${FN} itpp)      
+                IF(ITPP_LIBRARY_DEBUG)
+                        target_link_libraries (${FN} debug itpp_debug)
+                        target_link_libraries (${FN} optimized itpp)
+                ELSE(ITPP_LIBRARY_DEBUG)
+                        target_link_libraries (${FN} itpp_debug)        
+                ENDIF(ITPP_LIBRARY_DEBUG)
         ENDIF(WIN32)
         target_link_libraries (${FN} bdm)