diff options
| author | Denis Barbier <bouzim@gmail.com> | 2011-11-16 21:15:54 +0100 |
|---|---|---|
| committer | Denis Barbier <bouzim@gmail.com> | 2011-11-19 19:30:51 +0100 |
| commit | 06ea9a19c9ca42df74e7bc6e1da99fd94fb45dff (patch) | |
| tree | 81b56b187b853dfdaa2bb37b6751e18ca15826d2 | |
| parent | e165ab061b3fac26abb96b26bcb77025a2b33347 (diff) | |
| download | oce-06ea9a19c9ca42df74e7bc6e1da99fd94fb45dff.tar.gz oce-06ea9a19c9ca42df74e7bc6e1da99fd94fb45dff.zip | |
Fixes to allow building with cmake 2.6
Rewrite conditions to avoid parenthesis in IF clause, as in
IF(foo AND (bar OR baz))
this is not supported by CMake 2.6.
As unit testing uses CMake 2.8 features, it is disabled when
using an older version.
| -rwxr-xr-x | CMakeLists.txt | 29 | ||||
| -rw-r--r-- | adm/cmake/BuildToolkit.cmake | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c65b017..d8812f4f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ SET(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}.${OCE_VERSION_PATCH}${ SET(OCE_ABI_SOVERSION 1) SET(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0) -# Set the minimum version of cmake required to 2.8 -CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) +# Set the minimum version of cmake required to 2.6 +CMAKE_MINIMUM_REQUIRED( VERSION 2.6 ) # Define helper macro OPTION_WITH_DEFAULT MACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT ) @@ -41,10 +41,6 @@ MACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT ) OPTION( ${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}} ) ENDMACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT ) -IF( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.7 ) - MESSAGE( FATAL_ERROR "CMake >= 2.8.0 required" ) -ENDIF( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.7 ) - ############################ # Check 32/64 bit platform # ############################ @@ -104,8 +100,10 @@ OPTION_WITH_DEFAULT( ${PROJECT_NAME}_WITH_GL2PS "Build with GL2PS" OFF ) OPTION_WITH_DEFAULT( ${PROJECT_NAME}_WITH_FREEIMAGE "Build with FreeImage" OFF ) OPTION_WITH_DEFAULT( ${PROJECT_NAME}_EXTRA_WARNINGS "Enable Maximum Warnings Level" OFF ) MARK_AS_ADVANCED(${PROJECT_NAME}_EXTRA_WARNINGS) -OPTION_WITH_DEFAULT( ${PROJECT_NAME}_TESTING "Enable unittesting framework" OFF ) -MARK_AS_ADVANCED(${PROJECT_NAME}_TESTING) +IF( NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8 ) + OPTION_WITH_DEFAULT( ${PROJECT_NAME}_TESTING "Enable unittesting framework" OFF ) + MARK_AS_ADVANCED(${PROJECT_NAME}_TESTING) +ENDIF( NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8 ) OPTION_WITH_DEFAULT( ${PROJECT_NAME}_ADD_HEADERS "Add headers to project files" OFF ) MARK_AS_ADVANCED(${PROJECT_NAME}_ADD_HEADERS) @@ -166,13 +164,14 @@ ENDIF(MSVC_IDE) # Check components dependencies # SET(${PROJECT_NAME}_FOUNDATION TRUE) -IF(NOT ${PROJECT_NAME}_DISABLE_X11 AND ( - ${PROJECT_NAME}_OCAF OR ${PROJECT_NAME}_DATAEXCHANGE OR - ${PROJECT_NAME}_VISUALISATION OR ${PROJECT_NAME}_DRAW)) - SET(${PROJECT_NAME}_VISU_DEP TRUE) -ENDIF(NOT ${PROJECT_NAME}_DISABLE_X11 AND ( - ${PROJECT_NAME}_OCAF OR ${PROJECT_NAME}_DATAEXCHANGE OR - ${PROJECT_NAME}_VISUALISATION OR ${PROJECT_NAME}_DRAW)) +IF(${PROJECT_NAME}_OCAF OR ${PROJECT_NAME}_DATAEXCHANGE OR ${PROJECT_NAME}_VISUALISATION OR ${PROJECT_NAME}_DRAW) + SET(${PROJECT_NAME}_VISU_DEP TRUE) +ELSE(${PROJECT_NAME}_OCAF OR ${PROJECT_NAME}_DATAEXCHANGE OR ${PROJECT_NAME}_VISUALISATION OR ${PROJECT_NAME}_DRAW) + SET(${PROJECT_NAME}_VISU_DEP FALSE) +ENDIF(${PROJECT_NAME}_OCAF OR ${PROJECT_NAME}_DATAEXCHANGE OR ${PROJECT_NAME}_VISUALISATION OR ${PROJECT_NAME}_DRAW) +IF(${PROJECT_NAME}_DISABLE_X11) + SET(${PROJECT_NAME}_VISU_DEP FALSE) +ENDIF(${PROJECT_NAME}_DISABLE_X11) IF(${PROJECT_NAME}_DISABLE_X11) SET(${PROJECT_NAME}_DRAW OFF CACHE BOOL "Build DRAWEXE" FORCE) SET(${PROJECT_NAME}_VISUALISATION OFF CACHE BOOL "Build visualisation component" FORCE) diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake index 796f567f..3fe94e1a 100644 --- a/adm/cmake/BuildToolkit.cmake +++ b/adm/cmake/BuildToolkit.cmake @@ -108,7 +108,7 @@ ENDIF(DEFINED X11_FONT_PATH) # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) # Win64+MSVC+static libs = linker error -IF(MSVC AND (NOT ${PROJECT_NAME}_BUILD_SHARED_LIB) AND (BIT EQUAL 64)) +IF(MSVC AND NOT ${PROJECT_NAME}_BUILD_SHARED_LIB AND BIT EQUAL 64) set_target_properties(${TOOLKIT} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF() |