[cmake-commits] hoffman committed FindJNI.cmake 1.25.2.3 1.25.2.4
FindPerlLibs.cmake 1.5 1.5.2.1
InstallRequiredSystemLibraries.cmake 1.3.2.2 1.3.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Dec 11 22:28:47 EST 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17540/Modules
Modified Files:
Tag: CMake-2-4
FindJNI.cmake FindPerlLibs.cmake
InstallRequiredSystemLibraries.cmake
Log Message:
ENH: changes for RC5
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -d -r1.25.2.3 -r1.25.2.4
--- FindJNI.cmake 3 Jan 2007 21:09:14 -0000 1.25.2.3
+++ FindJNI.cmake 12 Dec 2007 03:28:45 -0000 1.25.2.4
@@ -6,7 +6,7 @@
# JAVA_AWT_LIB_PATH = the path to the jawt library
# JAVA_JVM_LIB_PATH = the path to the jvm library
# JAVA_INCLUDE_PATH = the include path to jni.h
-# JAVA_INCLUDE_PATH2 = the include path to jni.h
+# JAVA_INCLUDE_PATH2 = the include path to jni_md.h
# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
#
@@ -79,17 +79,33 @@
IF(EXISTS /Library/Frameworks/JavaVM.framework)
SET(JAVA_HAVE_FRAMEWORK 1)
ENDIF(EXISTS /Library/Frameworks/JavaVM.framework)
+ IF(EXISTS /System/Library/Frameworks/JavaVM.framework)
+ SET(JAVA_HAVE_FRAMEWORK 1)
+ ENDIF(EXISTS /System/Library/Frameworks/JavaVM.framework)
+
IF(JAVA_HAVE_FRAMEWORK)
IF(NOT JAVA_AWT_LIBRARY)
SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
ENDIF(NOT JAVA_AWT_LIBRARY)
+
IF(NOT JAVA_JVM_LIBRARY)
SET (JAVA_JVM_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
ENDIF(NOT JAVA_JVM_LIBRARY)
- SET(JAVA_AWT_INCLUDE_DIRECTORIES ${JAVA_AWT_INCLUDE_DIRECTORIES}
+
+ IF(NOT JAVA_AWT_INCLUDE_PATH)
+ IF(EXISTS /System/Library/Frameworks/JavaVM.framework/Headers/jawt.h)
+ SET (JAVA_AWT_INCLUDE_PATH "/System/Library/Frameworks/JavaVM.framework/Headers" CACHE FILEPATH "jawt.h location" FORCE)
+ ENDIF(EXISTS /System/Library/Frameworks/JavaVM.framework/Headers/jawt.h)
+ ENDIF(NOT JAVA_AWT_INCLUDE_PATH)
+
+ # If using "-framework JavaVM", prefer its headers *before* the others in
+ # JAVA_AWT_INCLUDE_DIRECTORIES... (*prepend* to the list here)
+ #
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
~/Library/Frameworks/JavaVM.framework/Headers
/Library/Frameworks/JavaVM.framework/Headers
/System/Library/Frameworks/JavaVM.framework/Headers
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
)
ENDIF(JAVA_HAVE_FRAMEWORK)
ELSE(APPLE)
@@ -113,7 +129,9 @@
)
FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
- ${JAVA_AWT_INCLUDE_DIRECTORIES} ${JAVA_INCLUDE_PATH} )
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ ${JAVA_INCLUDE_PATH}
+)
MARK_AS_ADVANCED(
JAVA_AWT_LIBRARY
Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- InstallRequiredSystemLibraries.cmake 15 Feb 2007 17:45:07 -0000 1.3.2.2
+++ InstallRequiredSystemLibraries.cmake 12 Dec 2007 03:28:45 -0000 1.3.2.3
@@ -1,7 +1,17 @@
-# Hack for Visual Studio support
-# Search for system runtime libraries based on the platform. This is
-# not complete because it is used only for the release process by the
-# developers.
+# By including this file, all files in the CMAKE_INSTALL_DEBUG_LIBRARIES,
+# will be installed with INSTALL_PROGRAMS into /bin for WIN32 and /lib
+# for non-win32. If CMAKE_SKIP_INSTALL_RULES is set to TRUE before including
+# this file, then the INSTALL command is not called. The use can use
+# the variable CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install
+# command and install them into any directory they want.
+# If it is the MSVC compiler, then the microsoft run
+# time libraries will be found add automatically added to the
+# CMAKE_INSTALL_DEBUG_LIBRARIES, and installed.
+# If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
+# compiler, then the debug libraries are installed when available.
+# If CMAKE_INSTALL_MFC_LIBRARIES is set then the MFC run time
+# libraries are installed as well as the CRT run time libraries.
+
IF(MSVC)
FILE(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT)
IF(MSVC70)
@@ -32,6 +42,18 @@
"${MSVC80_CRT_DIR}/msvcp80.dll"
"${MSVC80_CRT_DIR}/msvcr80.dll"
)
+
+ IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+ SET(MSVC80_CRT_DIR
+ "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT")
+ SET(__install__libs ${__install__libs}
+ "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
+ "${MSVC80_CRT_DIR}/msvcm80d.dll"
+ "${MSVC80_CRT_DIR}/msvcp80d.dll"
+ "${MSVC80_CRT_DIR}/msvcr80d.dll"
+ )
+ ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+
ENDIF(MSVC80)
IF(CMAKE_INSTALL_MFC_LIBRARIES)
IF(MSVC70)
@@ -45,6 +67,18 @@
)
ENDIF(MSVC71)
IF(MSVC80)
+ IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+ SET(MSVC80_MFC_DIR
+ "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugMFC")
+ SET(__install__libs ${__install__libs}
+ "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
+ "${MSVC80_MFC_DIR}/mfc80d.dll"
+ "${MSVC80_MFC_DIR}/mfc80ud.dll"
+ "${MSVC80_MFC_DIR}/mfcm80d.dll"
+ "${MSVC80_MFC_DIR}/mfcm80ud.dll"
+ )
+ ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+
SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFC")
# Install the manifest that allows DLLs to be loaded from the
# directory containing the executable.
@@ -56,6 +90,24 @@
"${MSVC80_MFC_DIR}/mfcm80u.dll"
)
ENDIF(MSVC80)
+ IF(MSVC80)
+ # include the language dll's for vs8 as well as the actuall dll's
+ SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFCLOC")
+ # Install the manifest that allows DLLs to be loaded from the
+ # directory containing the executable.
+ SET(__install__libs ${__install__libs}
+ "${MSVC80_MFCLOC_DIR}/Microsoft.VC80.MFCLOC.manifest"
+ "${MSVC80_MFCLOC_DIR}/mfc80chs.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80cht.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80enu.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80esp.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80deu.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80fra.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80ita.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80jpn.dll"
+ "${MSVC80_MFCLOC_DIR}/mfc80kor.dll"
+ )
+ ENDIF(MSVC80)
ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)
FOREACH(lib
${__install__libs}
@@ -70,11 +122,13 @@
# Include system runtime libraries in the installation if any are
# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+ IF(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
IF(WIN32)
INSTALL_PROGRAMS(/bin ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
ELSE(WIN32)
INSTALL_PROGRAMS(/lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
ENDIF(WIN32)
+ ENDIF(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
ENDIF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
Index: FindPerlLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerlLibs.cmake,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- FindPerlLibs.cmake 15 Dec 2005 19:17:42 -0000 1.5
+++ FindPerlLibs.cmake 12 Dec 2007 03:28:45 -0000 1.5.2.1
@@ -32,7 +32,7 @@
IF(PERL_EXECUTABLE)
EXEC_PROGRAM(${PERL_EXECUTABLE}
- ARGS -e "'use Config; print $Config{libperl}, \"\\n\"'"
+ ARGS -e "'use Config; print \$Config{libperl}, \"\\n\"'"
OUTPUT_VARIABLE PERL_LIBRARY_OUTPUT_VARIABLE
RETURN_VALUE PERL_LIBRARY_RETURN_VALUE
)
@@ -42,13 +42,12 @@
ENDFOREACH(path ${PERL_POSSIBLE_LIB_PATHS})
ENDIF(NOT PERL_LIBRARY_RETURN_VALUE)
EXEC_PROGRAM(${PERL_EXECUTABLE}
- ARGS -e "'use Config; print $Config{cppflags}, \"\\n\"'"
+ ARGS -e "'use Config; print \$Config{cppflags}, \"\\n\"'"
OUTPUT_VARIABLE PERL_CPPFLAGS_OUTPUT_VARIABLE
RETURN_VALUE PERL_CPPFLAGS_RETURN_VALUE
)
IF(NOT PERL_CPPFLAGS_RETURN_VALUE)
SET(PERL_EXTRA_C_FLAGS ${PERL_CPPFLAGS_OUTPUT_VARIABLE})
- SEPARATE_ARGUMENTS(PERL_EXTRA_C_FLAGS)
ENDIF(NOT PERL_CPPFLAGS_RETURN_VALUE)
ENDIF(PERL_EXECUTABLE)
More information about the Cmake-commits
mailing list