diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-24 16:52:39 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-24 16:52:39 (GMT) |
| commit | 919265516ea3233e6a4e29a17ad4ec24150eefda (patch) | |
| tree | 1d2beab70b483ab0f2153d6766763094c7b11331 /Modules | |
| parent | 4ae802d9c19d1f021970215d992b6aebc4165ec8 (diff) | |
| download | CMake-919265516ea3233e6a4e29a17ad4ec24150eefda.zip CMake-919265516ea3233e6a4e29a17ad4ec24150eefda.tar.gz CMake-919265516ea3233e6a4e29a17ad4ec24150eefda.tar.bz2 | |
ENH: add ReadListFile() to cmCPackGenericGenerator, so cmMakefile can be
private again
-convert the ZIP generator to use a cmake script instead of hardcoding
everything (CPackZIP.cmake)
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackZIP.cmake | 27 | ||||
| -rw-r--r-- | Modules/Platform/BlueGeneL.cmake | 5 |
2 files changed, 32 insertions, 0 deletions
diff --git a/Modules/CPackZIP.cmake b/Modules/CPackZIP.cmake new file mode 100644 index 0000000..4a65856 --- /dev/null +++ b/Modules/CPackZIP.cmake @@ -0,0 +1,27 @@ +IF(CMAKE_BINARY_DIR) + MESSAGE(FATAL_ERROR "CPackZIP.cmake may only be used by CPack internally.") +ENDIF(CMAKE_BINARY_DIR) + +FIND_PROGRAM(ZIP_EXECUTABLE wzzip PATHS "$ENV{ProgramFiles}/WinZip") +IF(ZIP_EXECUTABLE) + SET(CPACK_ZIP_COMMAND "\"${ZIP_EXECUTABLE}\" -P \"<ARCHIVE>\" @<FILELIST>") + SET(CPACK_ZIP_NEED_QUOTES TRUE) +ENDIF(ZIP_EXECUTABLE) + +IF(NOT ZIP_EXECUTABLE) + FIND_PROGRAM(ZIP_EXECUTABLE 7z PATHS "$ENV{ProgramFiles}/7-Zip") + IF(ZIP_EXECUTABLE) + SET(CPACK_ZIP_COMMAND "\"${ZIP_EXECUTABLE}\" a -tzip \"<ARCHIVE>\" @<FILELIST>") + SET(CPACK_ZIP_NEED_QUOTES TRUE) + ENDIF(ZIP_EXECUTABLE) +ENDIF(NOT ZIP_EXECUTABLE) + +IF(NOT ZIP_EXECUTABLE) + FIND_PACKAGE(Cygwin) + FIND_PROGRAM(ZIP_EXECUTABLE zip PATHS "${CYGWIN_INSTALL_PATH}/bin") + IF(ZIP_EXECUTABLE) + SET(CPACK_ZIP_COMMAND "\"${ZIP_EXECUTABLE}\" -r \"<ARCHIVE>\" . -i@<FILELIST>") + SET(CPACK_ZIP_NEED_QUOTES FALSE) + ENDIF(ZIP_EXECUTABLE) +ENDIF(NOT ZIP_EXECUTABLE) + diff --git a/Modules/Platform/BlueGeneL.cmake b/Modules/Platform/BlueGeneL.cmake index 2db0a41..b104ad9 100644 --- a/Modules/Platform/BlueGeneL.cmake +++ b/Modules/Platform/BlueGeneL.cmake @@ -30,3 +30,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-lstdc++,-lgcc,-lc -lnss_files -lnss_dns -lresolv") ENDIF(CMAKE_COMPILER_IS_GNUCXX) + +SET(CMAKE_CXX_LINK_SHARED_LIBRARY) +SET(CMAKE_CXX_LINK_MODULE_LIBRARY) +SET(CMAKE_C_LINK_SHARED_LIBRARY) +SET(CMAKE_C_LINK_MODULE_LIBRARY) |