Skip to content
Permalink
Browse files

reintroduce PUBLIC_HEADERS removed in af50295

  • Loading branch information
jef-n committed Aug 8, 2012
1 parent 2ab0221 commit 55628dd81dff9af5714cf2cd4e4fdf3f33873321
Showing with 10 additions and 27 deletions.
  1. +3 −9 src/analysis/CMakeLists.txt
  2. +3 −8 src/analysis/network/CMakeLists.txt
  3. +2 −5 src/core/CMakeLists.txt
  4. +2 −5 src/gui/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

@@ -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

@@ -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
@@ -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

2 comments on commit 55628dd

@kyngchaos

This comment has been minimized.

Copy link
Contributor

@kyngchaos kyngchaos replied Aug 8, 2012

So, were the OSX properties causing problems?

@jef-n

This comment has been minimized.

Copy link
Member Author

@jef-n jef-n replied Aug 8, 2012

Well, "Copying OS X content to..." on Linux and Windows didn't look right.

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