Merge pull request pocoproject#938 from adasworks/develop

aleks-f · aleks-f · commit 8aef165ed543 · 2015-09-15T10:28:42.000-05:00
fix: cmake: set public compiler flags on library targets
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,11 +99,12 @@ endif()
 
 # Uncomment from next two lines to force static or dynamic library, default is autodetection
 if(POCO_STATIC)
-    add_definitions( -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS)
+    set( LIB_MODE_DEFINITIONS -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS)
     set( LIB_MODE STATIC )
     message(STATUS "Building static libraries")
 else(POCO_STATIC)
     set( LIB_MODE SHARED )
+    set( LIB_MODE_DEFINITIONS -DPOCO_NO_AUTOMATIC_LIBS)
     message(STATUS "Building dynamic libraries")
 endif(POCO_STATIC)
 
diff --git a/CppParser/CMakeLists.txt b/CppParser/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt
@@ -20,3 +20,4 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
diff --git a/CppUnit/WinTestRunner/CMakeLists.txt b/CppUnit/WinTestRunner/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 if(WIN32)
     target_link_libraries( ${LIBNAME} winmm )
diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
@@ -34,6 +34,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt
@@ -27,6 +27,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt
@@ -48,6 +48,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -168,6 +168,7 @@ target_include_directories( "${LIBNAME}"
 		$<INSTALL_INTERFACE:include>
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
 	)
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/MongoDB/CMakeLists.txt b/MongoDB/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
@@ -34,6 +34,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt
@@ -130,6 +130,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/SevenZip/CMakeLists.txt b/SevenZip/CMakeLists.txt
@@ -66,6 +66,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt
@@ -42,6 +42,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
@@ -48,6 +48,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt
@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"
         $<INSTALL_INTERFACE:include>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ target_include_directories( "${LIBNAME}"`
`25`	`25`	`$<INSTALL_INTERFACE:include>`
`26`	`26`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`27`	`27`	`)`
	`28`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
`28`	`29`
`29`	`30`	`POCO_INSTALL("${LIBNAME}")`
`30`	`31`	`POCO_GENERATE_PACKAGE("${LIBNAME}")`
Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@ target_include_directories( "${LIBNAME}"`
`20`	`20`	`$<INSTALL_INTERFACE:include>`
`21`	`21`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`22`	`22`	`)`
	`23`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ target_include_directories( "${LIBNAME}"`
`27`	`27`	`$<INSTALL_INTERFACE:include>`
`28`	`28`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`29`	`29`	`)`
	`30`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
`30`	`31`
`31`	`32`	`if(WIN32)`
`32`	`33`	`target_link_libraries( ${LIBNAME} winmm )`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ target_include_directories( "${LIBNAME}"`
`34`	`34`	`$<INSTALL_INTERFACE:include>`
`35`	`35`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`36`	`36`	`)`
	`37`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
`37`	`38`
`38`	`39`	`POCO_INSTALL("${LIBNAME}")`
`39`	`40`	`POCO_GENERATE_PACKAGE("${LIBNAME}")`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ target_include_directories( "${LIBNAME}"`
`48`	`48`	`$<INSTALL_INTERFACE:include>`
`49`	`49`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`50`	`50`	`)`
	`51`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
`51`	`52`
`52`	`53`	`POCO_INSTALL("${LIBNAME}")`
`53`	`54`	`POCO_GENERATE_PACKAGE("${LIBNAME}")`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ target_include_directories( "${LIBNAME}"`
`168`	`168`	`$<INSTALL_INTERFACE:include>`
`169`	`169`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src`
`170`	`170`	`)`
	`171`	`+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})`
`171`	`172`
`172`	`173`	`POCO_INSTALL("${LIBNAME}")`
`173`	`174`	`POCO_GENERATE_PACKAGE("${LIBNAME}")`