Changeset 247

Timestamp:

01/23/09 15:33:11 (15 years ago)

Author:

smidl

Message:

cmake fixes for opensuse

Files:

• CMakeLists.txt (modified) (1 diff)
• CMake_modules/FindITPP.cmake (modified) (1 diff)
• tests/CMakeLists.txt (modified) (2 diffs)

CMakeLists.txt

@@ -26 +26 @@
 ELSE()
         #This is for UNIX makefile which does only one release at a time.
-        SET(CMAKE_BUILD_TYPE Debug)
+        SET(CMAKE_BUILD_TYPE Optimized)
         SET(CMAKE_CXX_FLAGS "-Wall -pipe  -Wno-unknown-pragmas")
         SET(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG -O2")
         SET(CMAKE_CXX_FLAGS_DEBUG "-g")
+        SET(CMAKE_CXX_FLAGS "-O2 -Wall -Wno-unknown-pragmas")
+        ADD_DEFINITIONS(-DNDEBUG)
         INCLUDE(CMakeLocal.txt OPTIONAL)        
 ENDIF(WIN32)

CMake_modules/FindITPP.cmake

@@ -20 +20 @@
   "${ITPP_DIR}\\win32\\lib"
   /usr/pkgs64/lib
+  /usr/lib64
   NO_DEFAULT_PATH
 )

tests/CMakeLists.txt

@@ -4 +4 @@
 # Make sure the linker can find the Hello library once it is built.
 link_directories (${BDM_BINARY_DIR}/bdm)
+
+# Define macro for testing a file
+MACRO(TEST FN)
+        add_executable (${FN} ${FN}.cpp)
+        target_link_libraries (${FN} debug itpp_debug)
+        target_link_libraries (${FN} optimized itpp)
+        target_link_libraries (${FN} bdm ${AddLib})
+ENDMACRO(TEST)
 
 # Add executable called "helloDemo" that is built from the source files
@@ -40 +48 @@
 
 IF(${XERCES_FOUND})
-EXEC(testUI)
-target_link_libraries (testUI ${XERCES_LIBRARIES})
+  EXEC(testUI)
+  target_link_libraries (testUI ${XERCES_LIBRARIES})
 ENDIF(${XERCES_FOUND})