reintroduce PUBLIC_HEADERS removed in af50295

qgis · Aug 8, 2012 · 55628dd · 55628dd · kyngchaos · Aug 8, 2012
1 parent 2ab0221
commit 55628dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -101,17 +101,18 @@ ENDIF (WIN32)
 # qgis_analysis library
 
 ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})
+SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}")
 
 IF(APPLE)
   SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
     # no moc headers, messes up PROPERTIES syntax
-    PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
     CLEAN_DIRECT_OUTPUT 1
     FRAMEWORK 1
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
     MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis
+    BUILD_WITH_INSTALL_RPATH TRUE
   )
 ENDIF(APPLE)
 
@@ -124,14 +125,7 @@ IF (NOT ANDROID)
 ENDIF (NOT ANDROID)
 
 ADD_DEPENDENCIES(qgis_analysis qgis_core)
-
-TARGET_LINK_LIBRARIES(qgis_analysis
-  qgis_core
-)
-
-IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-ENDIF (APPLE)
+TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)
 
 # install
 

diff --git a/src/analysis/network/CMakeLists.txt b/src/analysis/network/CMakeLists.txt
@@ -43,16 +43,17 @@ INCLUDE_DIRECTORIES(
 # qgis_analysis library
 
 ADD_LIBRARY(qgis_networkanalysis SHARED ${QGIS_NETWORK_ANALYSIS_SRCS} ${QGIS_NETWORK_ANALYSIS_MOC_SRCS} ${QGIS_NETWORK_ANALYSIS_HDRS})
+SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}")
 
 IF(APPLE)
   SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
-    PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
     CLEAN_DIRECT_OUTPUT 1
     FRAMEWORK 1
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
     MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis
+    BUILD_WITH_INSTALL_RPATH TRUE
   )
 ENDIF(APPLE)
 
@@ -66,13 +67,7 @@ ENDIF (NOT ANDROID)
 
 ADD_DEPENDENCIES(qgis_networkanalysis qgis_core)
 
-TARGET_LINK_LIBRARIES(qgis_networkanalysis
-  qgis_core
-)
-
-IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE )
-ENDIF (APPLE)
+TARGET_LINK_LIBRARIES(qgis_networkanalysis qgis_core)
 
 # install
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -491,16 +491,17 @@ ENDIF (WIN32)
 # qgis_core library
 
 ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
+SET_TARGET_PROPERTIES(qgis_core PROPERTIES PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}")
 
 IF(APPLE)
   SET_TARGET_PROPERTIES(qgis_core PROPERTIES
-    PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
     CLEAN_DIRECT_OUTPUT 1
     FRAMEWORK 1
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
     MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core
+    BUILD_WITH_INSTALL_RPATH TRUE
   )
 ENDIF(APPLE)
 
@@ -558,10 +559,6 @@ ELSE (WITH_INTERNAL_SPATIALITE)
   TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
-IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_core PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-ENDIF (APPLE)
-
 # install
 
 INSTALL(TARGETS qgis_core

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -305,16 +305,17 @@ ADD_LIBRARY(qgis_gui SHARED
      ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS}
      #${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS}  # for ModelTest
 )
+SET_TARGET_PROPERTIES(qgis_gui PROPERTIES PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}")
 
 IF(APPLE)
   SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
-    PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
     CLEAN_DIRECT_OUTPUT 1
     FRAMEWORK 1
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
     MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui
+    BUILD_WITH_INSTALL_RPATH TRUE
   )
 ENDIF(APPLE)
 
@@ -344,10 +345,6 @@ IF(WIN32)
   ADD_DEFINITIONS(-DQWT_DLL)
 ENDIF(WIN32)
 
-IF (APPLE)
-  SET_TARGET_PROPERTIES(qgis_gui PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-ENDIF (APPLE)
-
 # install
 
 INSTALL(TARGETS qgis_gui