Skip to content

Commit 3f4df9f

Browse files
jef-njef-n
committedAug 14, 2012
use PUBLIC_HEADER only on mac (followup 55628dd)
·
ltr-3_40Before-merge-new_vector_api
1 parent 2626df9 commit 3f4df9f

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed
 

‎src/analysis/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ ENDIF (WIN32)
101101
# qgis_analysis library
102102

103103
ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})
104-
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}")
105104

106-
IF(APPLE)
105+
IF(NOT APPLE)
106+
INSTALL(FILES ${QGIS_ANALYSIS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
107+
ELSE(NOT APPLE)
107108
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
108109
# no moc headers, messes up PROPERTIES syntax
109110
CLEAN_DIRECT_OUTPUT 1
@@ -113,8 +114,9 @@ IF(APPLE)
113114
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
114115
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis
115116
BUILD_WITH_INSTALL_RPATH TRUE
117+
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
116118
)
117-
ENDIF(APPLE)
119+
ENDIF(NOT APPLE)
118120

119121
#generate unversioned libs for android
120122
IF (NOT ANDROID)

‎src/analysis/network/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ INCLUDE_DIRECTORIES(
4343
# qgis_analysis library
4444

4545
ADD_LIBRARY(qgis_networkanalysis SHARED ${QGIS_NETWORK_ANALYSIS_SRCS} ${QGIS_NETWORK_ANALYSIS_MOC_SRCS} ${QGIS_NETWORK_ANALYSIS_HDRS})
46-
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}")
4746

48-
IF(APPLE)
47+
IF(NOT APPLE)
48+
INSTALL(FILES ${QGIS_NETWORK_ANALYSIS_HDRS} ${QGIS_NETWORK_ANALYSIS_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
49+
ELSE(NOT APPLE)
4950
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
5051
CLEAN_DIRECT_OUTPUT 1
5152
FRAMEWORK 1
@@ -54,8 +55,9 @@ IF(APPLE)
5455
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
5556
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis
5657
BUILD_WITH_INSTALL_RPATH TRUE
58+
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
5759
)
58-
ENDIF(APPLE)
60+
ENDIF(NOT APPLE)
5961

6062
#generate unversioned libs for android
6163
IF (NOT ANDROID)

‎src/core/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,10 @@ ENDIF (WIN32)
491491
# qgis_core library
492492

493493
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
494-
SET_TARGET_PROPERTIES(qgis_core PROPERTIES PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}")
495494

496-
IF(APPLE)
495+
IF(NOT APPLE)
496+
INSTALL(FILES ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
497+
ELSE(NOT APPLE)
497498
SET_TARGET_PROPERTIES(qgis_core PROPERTIES
498499
CLEAN_DIRECT_OUTPUT 1
499500
FRAMEWORK 1
@@ -502,8 +503,9 @@ IF(APPLE)
502503
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
503504
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core
504505
BUILD_WITH_INSTALL_RPATH TRUE
506+
PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
505507
)
506-
ENDIF(APPLE)
508+
ENDIF(NOT APPLE)
507509

508510
#generate unversioned libs for android
509511
IF (NOT ANDROID)

‎src/gui/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,10 @@ ADD_LIBRARY(qgis_gui SHARED
305305
${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS}
306306
#${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS} # for ModelTest
307307
)
308-
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}")
309308

310-
IF(APPLE)
309+
IF(NOT APPLE)
310+
INSTALL(FILES ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
311+
ELSE(NOT APPLE)
311312
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
312313
CLEAN_DIRECT_OUTPUT 1
313314
FRAMEWORK 1
@@ -316,8 +317,9 @@ IF(APPLE)
316317
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
317318
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui
318319
BUILD_WITH_INSTALL_RPATH TRUE
320+
PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
319321
)
320-
ENDIF(APPLE)
322+
ENDIF(NOT APPLE)
321323

322324
#generate unversioned libs for android
323325
IF (NOT ANDROID)

1 commit comments

Comments
 (1)

kyngchaos commented on Aug 14, 2012

@kyngchaos
kyngchaos
on Aug 14, 2012
Contributor

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.