Changeset 16

Timestamp:

06/06/08 18:00:46

Author:

robert

Message:

Changed in support for CMake 2.6 support

Files:

• trunk/CMakeLists.txt (modified) (7 diffs)
• trunk/CMakeModules/P3dMacroUtils.cmake (modified) (9 diffs)

trunk/CMakeLists.txt

@@ -12 +12 @@
-ENDIF(WIN32)
-
+if(COMMAND cmake_policy)
+    # Works around warnings libraries linked against that don't
+    # have absolute paths (e.g. -lpthreads)
+    cmake_policy(SET CMP0003 NEW)
+
+    # Works around warnings about escaped quotes in ADD_DEFINITIONS
+    # statements.
+    cmake_policy(SET CMP0005 OLD)
+endif(COMMAND cmake_policy)
+
-
-PROJECT(PRESENT3D)
@@ -34 +44 @@
-
-# Okay, here's the problem: On some platforms, linking against OpenThreads
- 
+
-# is also required (e.g. FreeBSD). But OpenThreads may be built with different
- 
- 
- 
+
+
+
-# because the libraries may be incompatible.
- 
+
-# cases. With IRIX, we're going to hope explicit linking to the underlying
-# library is not necessary. We currently don't case for pthreads on Windows
@@ -47 +57 @@
-IF(CMAKE_SYSTEM MATCHES IRIX)
-    # Erase CMAKE_THREAD_LIBS_INIT and hope it works
-    
+
-ENDIF(CMAKE_SYSTEM MATCHES IRIX)
-
@@ -66 +76 @@
-    ${OPENGL_INCLUDE_DIR}
-)
-
+
-# Common global definitions
-#ADD_DEFINITIONS(-D)
@@ -120 +130 @@
-    SET(LIB_POSTFIX "")
-ENDIF(NOT DEFINED LIB_POSTFIX)
-
+
-#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
-SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
@@ -152 +162 @@
-# Automatically detected build options
-EXEC_PROGRAM(osgversion ARGS Matrix::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_MATRIX)
-        
+
-    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
-        
+
-
-EXEC_PROGRAM(osgversion ARGS Plane::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_PLANE)
-        
+
-    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
-        
+
-
-EXEC_PROGRAM(osgversion ARGS BoundingSphere::value_type  OUTPUT_VARIABLE OSG_USE_FLOAT_BOUNDINGSPHERE)
-        
+
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGSPHERE)
-        
+
-
-EXEC_PROGRAM(osgversion ARGS BoundingBox::value_type OUTPUT_VARIABLE OSG_USE_FLOAT_BOUNDINGBOX)
-        
+
-    ADD_DEFINITIONS(-DOSG_USE_DOUBLE_BOUNDINGBOX)
-        
+
-
-
@@ -187 +197 @@
-
-
-
+
+
-# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-IF(APPLE)
-    # These are just defaults/recommendations, but how we want to build
-    # out of the box. But the user needs to be able to change these options.
- 
+
-    # will overwrite any changes the user sets.
-    # FORCE is used because the options are not reflected in the UI otherwise.

trunk/CMakeModules/P3dMacroUtils.cmake

@@ -6 +6 @@
-#  is intended as a list of variable names each one containing  the path of the libraries to link to
-#  The existance of a varibale name with _DEBUG appended is tested and, in case it' s value is used
- 
+
-#  the content of this library for linking when in debugging
-#######################################################################################################
@@ -22 +22 @@
-
-MACRO(LINK_INTERNAL TRGTNAME)
-
-
-
+
+
+
+
+
+
+
-ENDMACRO(LINK_INTERNAL TRGTNAME)
-
@@ -39 +43 @@
-
-MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
- 
+
-    LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
-    IF(PRESENT3D_SONAMES)
@@ -63 +67 @@
-    #
-    # This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plagins
- 
- 
+
+
-    # the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
-    #
- 
+
-    ##################################################################################
-    SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
@@ -83 +87 @@
-    ENDFOREACH(LINKLIB)
-
-
-
-
+
+
+
+
-
-    FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
@@ -109 +114 @@
-
-    IF(${IS_COMMANDLINE_APP})
-
+
-        ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H})
-
+
-    ELSE(${IS_COMMANDLINE_APP})
-
+
-        IF(APPLE)
-            # SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PRESENT3D_MAJOR_VERSION}.${PRESENT3D_MINOR_VERSION}.${PRESENT3D_PATCH_VERSION}")
@@ -141 +146 @@
-
-        ADD_EXECUTABLE(${TARGET_TARGETNAME} ${PLATFORM_SPECIFIC_CONTROL} ${TARGET_SRC} ${TARGET_H})
-
+
-    ENDIF(${IS_COMMANDLINE_APP})
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-
-    
+
+
-
-ENDMACRO(SETUP_EXE)
@@ -161 +166 @@
-            SET(IS_COMMANDLINE_APP 0)
-        ENDIF(${ARGC} GREATER 1)
-
+
-        SETUP_EXE(${IS_COMMANDLINE_APP})
-
+
-    INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin  )
-
@@ -184 +189 @@
-            SET(IS_COMMANDLINE_APP 0)
-        ENDIF(${ARGC} GREATER 1)
-
+
-        SETUP_EXE(${IS_COMMANDLINE_APP})
-
-            
+
+
-
-ENDMACRO(SETUP_EXAMPLE)