[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi CERTICPackOptions.cmake.in CMakeLists.txt
From: |
CERTI CVS commits |
Subject: |
[certi-cvs] certi CERTICPackOptions.cmake.in CMakeLists.txt |
Date: |
Wed, 27 Apr 2011 16:02:12 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 11/04/27 16:02:12
Modified files:
. : CERTICPackOptions.cmake.in CMakeLists.txt
Log message:
One more try to build a Mac OS installer
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CERTICPackOptions.cmake.in?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.101&r2=1.102
Patches:
Index: CERTICPackOptions.cmake.in
===================================================================
RCS file: /sources/certi/certi/CERTICPackOptions.cmake.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CERTICPackOptions.cmake.in 11 Nov 2010 17:38:49 -0000 1.2
+++ CERTICPackOptions.cmake.in 27 Apr 2011 16:02:11 -0000 1.3
@@ -10,4 +10,10 @@
else(@MSVC@)
set(CPACK_PACKAGE_FILE_NAME "address@hidden@-${CPACK_SYSTEM_NAME}")
endif(@MSVC@)
+
+if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
+ set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr/local")
+ set(CPACK_OSX_PACKAGE_VERSION "10.4")
+endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
+
endif(@CPACK_GENERATOR@)
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- CMakeLists.txt 27 Apr 2011 15:07:43 -0000 1.101
+++ CMakeLists.txt 27 Apr 2011 16:02:12 -0000 1.102
@@ -397,7 +397,7 @@
SET(CPACK_PACKAGE_VENDOR "ONERA/DTIM")
SET(CPACK_PACKAGE_CONTACT "address@hidden")
SET(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/CERTI_DESCRIPTION.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
@@ -469,7 +469,11 @@
# Try to build a relocatable package (for CPackRPM)
SET(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
+IF(APPLE)
+ SET(CPACK_GENERATOR "TGZ;PackageMaker")
+ELSE(APPLE)
SET(CPACK_GENERATOR "TGZ;RPM;DEB")
+ENDIF(APPLE)
ENDIF (WIN32)
include(SystemSpecificInformations)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi CERTICPackOptions.cmake.in CMakeLists.txt,
CERTI CVS commits <=