diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-07 21:05:01 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-07 21:05:01 (GMT) |
| commit | 9c4bfe975a71337df6aa0046e86d0b8aba57ec62 (patch) | |
| tree | b515260c8d7350340d4eccaadec5890b6e816b22 /Modules | |
| parent | 99368244bb4e42fa8eed8afd19f65ade4adaa41a (diff) | |
| download | CMake-9c4bfe975a71337df6aa0046e86d0b8aba57ec62.zip CMake-9c4bfe975a71337df6aa0046e86d0b8aba57ec62.tar.gz CMake-9c4bfe975a71337df6aa0046e86d0b8aba57ec62.tar.bz2 | |
ENH: add a fix for VTK on the mac and a way to fix some projects with a single file in the cmake modules directory
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCInformation.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 5 | ||||
| -rw-r--r-- | Modules/CMakeFortranInformation.cmake | 5 | ||||
| -rw-r--r-- | Modules/VTKCompatibility.cmake | 7 |
4 files changed, 7 insertions, 14 deletions
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index cca45b7..a18fe4c 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -96,10 +96,6 @@ IF(NOT CMAKE_C_LINK_EXECUTABLE) "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") ENDIF(NOT CMAKE_C_LINK_EXECUTABLE) -IF(CMAKE_USER_MAKE_RULES_OVERRIDE) - INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) -ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) - MARK_AS_ADVANCED( CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 384e6be..499778e 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -154,11 +154,6 @@ IF(NOT CMAKE_CXX_LINK_EXECUTABLE) "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") ENDIF(NOT CMAKE_CXX_LINK_EXECUTABLE) -IF(CMAKE_USER_MAKE_RULES_OVERRIDE) - INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) -ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) - - MARK_AS_ADVANCED( CMAKE_BUILD_TOOL CMAKE_VERBOSE_MAKEFILE diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake index 2680db0..d711cf3 100644 --- a/Modules/CMakeFortranInformation.cmake +++ b/Modules/CMakeFortranInformation.cmake @@ -114,11 +114,6 @@ IF(NOT CMAKE_Fortran_LINK_EXECUTABLE) ENDIF(NOT CMAKE_Fortran_LINK_EXECUTABLE) -# Load the user define rules -IF(CMAKE_USER_MAKE_RULES_OVERRIDE) - INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) -ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) - MARK_AS_ADVANCED( CMAKE_Fortran_FLAGS diff --git a/Modules/VTKCompatibility.cmake b/Modules/VTKCompatibility.cmake new file mode 100644 index 0000000..7494a21 --- /dev/null +++ b/Modules/VTKCompatibility.cmake @@ -0,0 +1,7 @@ +MESSAGE("VTK specific hacks go here in VTKCompatibility") +IF(APPLE) + SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}") + SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}") + STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") + STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") +ENDIF(APPLE) |