diff options
| -rw-r--r-- | Modules/FindJava.cmake | 5 | ||||
| -rw-r--r-- | Templates/CCMakeSystemConfig.cmake.in | 36 | ||||
| -rw-r--r-- | Templates/CMakeBorlandWindowsSystemConfig.cmake | 34 | ||||
| -rw-r--r-- | Templates/CMakeDotNetSystemConfig.cmake | 12 | ||||
| -rw-r--r-- | Templates/CMakeNMakeWindowsSystemConfig.cmake | 16 | ||||
| -rw-r--r-- | Templates/CMakeWindowsSystemConfig.cmake | 17 | ||||
| -rw-r--r-- | Templates/CXXCMakeSystemConfig.cmake.in | 15 |
7 files changed, 75 insertions, 60 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index b4a5c40..4fae54e 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -20,3 +20,8 @@ FIND_PROGRAM(JAVA_COMPILE NAMES javac ) +MARK_AS_ADVANCED( +JAVA_RUNTIME +JAVA_ARCHIVE +JAVA_COMPILE +) diff --git a/Templates/CCMakeSystemConfig.cmake.in b/Templates/CCMakeSystemConfig.cmake.in index 9a61a37..60f97c0 100644 --- a/Templates/CCMakeSystemConfig.cmake.in +++ b/Templates/CCMakeSystemConfig.cmake.in @@ -113,32 +113,32 @@ ENDIF(CMAKE_SYSTEM MATCHES "HP-UX.*") # The following variables are advanced MARK_AS_ADVANCED( +CMAKE_ANSI_CFLAGS +CMAKE_AR +CMAKE_AR_ARGS +CMAKE_C_COMPILER +CMAKE_C_LINK_SHARED CMAKE_C_SHLIB_LINK_FLAGS CMAKE_C_SHLIB_RUNTIME_FLAG -CMAKE_X_LIBS -CMAKE_USE_SPROC -CMAKE_USE_PTHREADS -CMAKE_SHLIB_SUFFIX -CMAKE_MODULE_SUFFIX -CMAKE_C_COMPILER +CMAKE_DL_LIBS CMAKE_HP_PTHREADS -CMAKE_WORDS_BIGENDIAN -CMAKE_RANLIB -CMAKE_AR -CMAKE_AR_ARGS -CMAKE_SHLIB_CFLAGS -CMAKE_SHLIB_BUILD_FLAGS +CMAKE_MAKE_PROGRAM CMAKE_MODULE_BUILD_FLAGS -CMAKE_THREAD_LIBS -CMAKE_DL_LIBS -CMAKE_SHLIB_LINK_FLAGS CMAKE_MODULE_LINK_FLAGS +CMAKE_MODULE_SUFFIX +CMAKE_RANLIB +CMAKE_SHLIB_BUILD_FLAGS +CMAKE_SHLIB_CFLAGS CMAKE_SHLIB_LD_LIBS +CMAKE_SHLIB_LINK_FLAGS CMAKE_SHLIB_RUNTIME_FLAG CMAKE_SHLIB_RUNTIME_SEP +CMAKE_SHLIB_SUFFIX CMAKE_SKIP_RPATH +CMAKE_THREAD_LIBS +CMAKE_USE_PTHREADS +CMAKE_USE_SPROC +CMAKE_WORDS_BIGENDIAN CMAKE_X_CFLAGS -CMAKE_ANSI_CFLAGS -CMAKE_MAKE_PROGRAM -CMAKE_C_LINK_SHARED +CMAKE_X_LIBS ) diff --git a/Templates/CMakeBorlandWindowsSystemConfig.cmake b/Templates/CMakeBorlandWindowsSystemConfig.cmake index a19922c..87e60ef 100644 --- a/Templates/CMakeBorlandWindowsSystemConfig.cmake +++ b/Templates/CMakeBorlandWindowsSystemConfig.cmake @@ -96,30 +96,36 @@ SET (CMAKE_SIZEOF_FLOAT 4 CACHE INTERNAL "Size of float data type") SET (CMAKE_SIZEOF_DOUBLE 8 CACHE INTERNAL "Size of double data type") MARK_AS_ADVANCED( +CMAKE_CXX_COMPILER +CMAKE_CXX_FLAGS +CMAKE_CXX_FLAGS_DEBUG +CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_DEBUG +CMAKE_C_COMPILER +CMAKE_C_FLAGS +CMAKE_EXECUTABLE_SUFFIX +CMAKE_LINKER_FLAGS CMAKE_LINKER_FLAGS +CMAKE_LINKER_FLAGS_DEBUG CMAKE_LINKER_FLAGS_MINSIZEREL +CMAKE_LINKER_FLAGS_MINSIZEREL +CMAKE_LINKER_FLAGS_RELEASE CMAKE_LINKER_FLAGS_RELEASE CMAKE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_USE_WIN32_THREADS -CMAKE_STANDARD_WINDOWS_LIBRARIES -CMAKE_SHLIB_SUFFIX +CMAKE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_MAKE_PROGRAM +CMAKE_MODULE_SUFFIX CMAKE_MODULE_SUFFIX CMAKE_OBJECT_FILE_SUFFIX -CMAKE_EXECUTABLE_SUFFIX -CMAKE_STATICLIB_SUFFIX CMAKE_SHLIB_SUFFIX -CMAKE_MODULE_SUFFIX -CMAKE_LINKER_FLAGS -CMAKE_LINKER_FLAGS_DEBUG -CMAKE_LINKER_FLAGS_MINSIZEREL -CMAKE_LINKER_FLAGS_RELEASE -CMAKE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_SHLIB_SUFFIX +CMAKE_STANDARD_WINDOWS_LIBRARIES +CMAKE_STATICLIB_SUFFIX +CMAKE_USE_WIN32_THREADS ) MARK_AS_ADVANCED( CLEAR TCL_LIBRARY -TK_LIBRARY) +TK_LIBRARY +) diff --git a/Templates/CMakeDotNetSystemConfig.cmake b/Templates/CMakeDotNetSystemConfig.cmake index 9820557..03361a1 100644 --- a/Templates/CMakeDotNetSystemConfig.cmake +++ b/Templates/CMakeDotNetSystemConfig.cmake @@ -73,17 +73,19 @@ SET (CMAKE_STATICLIB_SUFFIX ".lib" CACHE INTERNAL MARK_AS_ADVANCED( BUILDNAME -CMAKE_CXX_USE_RTTI +CMAKE_CONFIGURATION_TYPES CMAKE_CXX_COMPILER +CMAKE_CXX_FLAGS CMAKE_CXX_STACK_SIZE +CMAKE_CXX_USE_RTTI CMAKE_CXX_WARNING_LEVEL -CMAKE_USE_WIN32_THREADS -CMAKE_MAKE_PROGRAM -CMAKE_EXTRA_LINK_FLAGS -MICROSOFT_DEVENV CMAKE_EXECUTABLE_SUFFIX +CMAKE_EXTRA_LINK_FLAGS +CMAKE_MAKE_PROGRAM CMAKE_MODULE_SUFFIX CMAKE_OBJECT_FILE_SUFFIX CMAKE_SHLIB_SUFFIX CMAKE_STATICLIB_SUFFIX +CMAKE_USE_WIN32_THREADS +MICROSOFT_DEVENV ) diff --git a/Templates/CMakeNMakeWindowsSystemConfig.cmake b/Templates/CMakeNMakeWindowsSystemConfig.cmake index 1f7ea39..fddbac0 100644 --- a/Templates/CMakeNMakeWindowsSystemConfig.cmake +++ b/Templates/CMakeNMakeWindowsSystemConfig.cmake @@ -147,14 +147,6 @@ MARK_AS_ADVANCED( CLEAR CMAKE_BUILD_TYPE) MARK_AS_ADVANCED( -WORDS_BIGENDIAN -HAVE_LIMITS_H -HAVE_UNISTD_H -CMAKE_EXECUTABLE_SUFFIX -CMAKE_MODULE_SUFFIX -CMAKE_OBJECT_FILE_SUFFIX -CMAKE_SHLIB_SUFFIX -CMAKE_STATICLIB_SUFFIX CMAKE_ANSI_CFLAGS CMAKE_CXX_COMPILER CMAKE_CXX_FLAGS @@ -168,6 +160,7 @@ CMAKE_C_LIBPATH_FLAG CMAKE_C_LINK_EXECUTABLE_FLAG CMAKE_C_OUTPUT_EXECUTABLE_FILE_FLAG CMAKE_C_OUTPUT_OBJECT_FILE_FLAG +CMAKE_EXECUTABLE_SUFFIX CMAKE_LIBRARY_MANAGER CMAKE_LIBRARY_MANAGER_FLAGS CMAKE_LIBRARY_MANAGER_OUTPUT_FILE_FLAG @@ -181,6 +174,13 @@ CMAKE_LINKER_HIDE_PARAMETERS CMAKE_LINKER_OUTPUT_FILE_FLAG CMAKE_LINKER_SHARED_LIBRARY_FLAG CMAKE_MAKE_PROGRAM +CMAKE_MODULE_SUFFIX +CMAKE_OBJECT_FILE_SUFFIX +CMAKE_SHLIB_SUFFIX CMAKE_STANDARD_WINDOWS_LIBRARIES +CMAKE_STATICLIB_SUFFIX CMAKE_USE_WIN32_THREADS +HAVE_LIMITS_H +HAVE_UNISTD_H +WORDS_BIGENDIAN ) diff --git a/Templates/CMakeWindowsSystemConfig.cmake b/Templates/CMakeWindowsSystemConfig.cmake index d2413ff..88c20c5 100644 --- a/Templates/CMakeWindowsSystemConfig.cmake +++ b/Templates/CMakeWindowsSystemConfig.cmake @@ -62,22 +62,23 @@ SET (CMAKE_STATICLIB_SUFFIX ".lib" CACHE INTERNAL # The following variables are advanced MARK_AS_ADVANCED( -WORDS_BIGENDIAN -HAVE_UNISTD_H -HAVE_LIMITS_H CMAKE_CXX_COMPILER +CMAKE_CXX_FLAGS +CMAKE_CXX_FLAGS_DEBUG +CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_DEBUG -CMAKE_USE_WIN32_THREADS -CMAKE_MAKE_PROGRAM -CMAKE_EXTRA_LINK_FLAGS CMAKE_EXECUTABLE_SUFFIX +CMAKE_EXTRA_LINK_FLAGS +CMAKE_MAKE_PROGRAM CMAKE_MODULE_SUFFIX CMAKE_OBJECT_FILE_SUFFIX CMAKE_SHLIB_SUFFIX CMAKE_STATICLIB_SUFFIX +CMAKE_USE_WIN32_THREADS +HAVE_LIMITS_H +HAVE_UNISTD_H +WORDS_BIGENDIAN ) diff --git a/Templates/CXXCMakeSystemConfig.cmake.in b/Templates/CXXCMakeSystemConfig.cmake.in index 94d8647..1b80955 100644 --- a/Templates/CXXCMakeSystemConfig.cmake.in +++ b/Templates/CXXCMakeSystemConfig.cmake.in @@ -99,15 +99,12 @@ SET (CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION @CMAKE_NO_EXPLICIT_TEMPLATE_ # The following variables are advanced MARK_AS_ADVANCED( -CMAKE_CXX_COMPILER +CMAKE_ANSI_CXXFLAGS +CMAKE_COMPILER_IS_GNUCXX CMAKE_CXX_AR CMAKE_CXX_AR_ARGS -CMAKE_TEMPLATE_FLAGS -CMAKE_NO_ANSI_FOR_SCOPE -CMAKE_NO_STD_NAMESPACE -CMAKE_COMPILER_IS_GNUCXX -CMAKE_ANSI_CXXFLAGS -CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION +CMAKE_CXX_COMPILER +CMAKE_CXX_FLAGS CMAKE_CXX_LINK_SHARED CMAKE_CXX_MODULE_BUILD_FLAGS CMAKE_CXX_MODULE_LINK_FLAGS @@ -116,4 +113,8 @@ CMAKE_CXX_SHLIB_CFLAGS CMAKE_CXX_SHLIB_LINK_FLAGS CMAKE_CXX_SHLIB_RUNTIME_FLAG CMAKE_CXX_SHLIB_RUNTIME_SEP +CMAKE_NO_ANSI_FOR_SCOPE +CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION +CMAKE_NO_STD_NAMESPACE +CMAKE_TEMPLATE_FLAGS ) |