Skip to content
Permalink
Browse files

use PUBLIC_HEADER only on mac (followup 55628dd)

  • Loading branch information
jef-n committed Aug 14, 2012
1 parent 2626df9 commit 3f4df9f6ab906b34270d84bbab0382096d5cf22d
Showing with 20 additions and 12 deletions.
  1. +5 −3 src/analysis/CMakeLists.txt
  2. +5 −3 src/analysis/network/CMakeLists.txt
  3. +5 −3 src/core/CMakeLists.txt
  4. +5 −3 src/gui/CMakeLists.txt
@@ -101,9 +101,10 @@ 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)
IF(NOT APPLE)
INSTALL(FILES ${QGIS_ANALYSIS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
# no moc headers, messes up PROPERTIES syntax
CLEAN_DIRECT_OUTPUT 1
@@ -113,8 +114,9 @@ IF(APPLE)
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
)
ENDIF(APPLE)
ENDIF(NOT APPLE)

#generate unversioned libs for android
IF (NOT ANDROID)
@@ -43,9 +43,10 @@ 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)
IF(NOT APPLE)
INSTALL(FILES ${QGIS_NETWORK_ANALYSIS_HDRS} ${QGIS_NETWORK_ANALYSIS_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
CLEAN_DIRECT_OUTPUT 1
FRAMEWORK 1
@@ -54,8 +55,9 @@ IF(APPLE)
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
)
ENDIF(APPLE)
ENDIF(NOT APPLE)

#generate unversioned libs for android
IF (NOT ANDROID)
@@ -491,9 +491,10 @@ 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)
IF(NOT APPLE)
INSTALL(FILES ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
SET_TARGET_PROPERTIES(qgis_core PROPERTIES
CLEAN_DIRECT_OUTPUT 1
FRAMEWORK 1
@@ -502,8 +503,9 @@ IF(APPLE)
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
)
ENDIF(APPLE)
ENDIF(NOT APPLE)

#generate unversioned libs for android
IF (NOT ANDROID)
@@ -305,9 +305,10 @@ 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)
IF(NOT APPLE)
INSTALL(FILES ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
ELSE(NOT APPLE)
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
CLEAN_DIRECT_OUTPUT 1
FRAMEWORK 1
@@ -316,8 +317,9 @@ IF(APPLE)
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
)
ENDIF(APPLE)
ENDIF(NOT APPLE)

#generate unversioned libs for android
IF (NOT ANDROID)

1 comment on commit 3f4df9f

@kyngchaos

This comment has been minimized.

Copy link
Contributor

@kyngchaos kyngchaos commented on 3f4df9f Aug 14, 2012

er, just wondering, is there a problem? cmake bug with PUBLIC_HEADER?

and from previous undoing, is there a problem with OS X properties?

Please sign in to comment.
You can’t perform that action at this time.