Improve CMakeLists.txt

Author: dbahrdt

CMakeLists.txt

@@ -27,9 +27,17 @@ if(CMAKE_CROSSCOMPILING AND ANDROID)
 	set(LIBRARY_OUTPUT_PATH_ROOT "${CMAKE_BINARY_DIR}")
 endif(CMAKE_CROSSCOMPILING AND ANDROID)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/osmpbf/include)
+set(OSMPBF_INCLUDE_DIRS
+	"${CMAKE_CURRENT_SOURCE_DIR}"
+	"${CMAKE_CURRENT_SOURCE_DIR}/osmpbf/include"
+	${CMAKE_CURRENT_BINARY_DIR}
+	"${CMAKE_CURRENT_BINARY_DIR}/osmpbf"
+	${PROTOBUF_INCLUDE_DIRS}
+	${ZLIB_INCLUDE_DIRS}
+	CACHE STRING "osmpbf include directories"
+	FORCE
+)
 
 add_subdirectory(osmpbf)
-
 add_subdirectory(examples EXCLUDE_FROM_ALL)
 

osmpbf/CMakeLists.txt

@@ -20,14 +20,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(osmpbf)
 
-set(DEBUG_FLAGS " ${DEBUG_FLAGS} -Wall")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${DEBUG_FLAGS}")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${DEBUG_FLAGS}")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_FLAGS}")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${DEBUG_FLAGS}")
-
 if(CMAKE_CROSSCOMPILING)
 	# find build host protoc and include generator function(s)
 	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
@@ -45,25 +37,20 @@ PROTOBUF_GENERATE_CPP(PROTO_SOURCES PROTO_HEADERS osmblob.proto osmformat.proto)
 
 find_package(ZLIB REQUIRED)
 
-set(OSMPBF_INCLUDE_DIRS
-	"${CMAKE_CURRENT_SOURCE_DIR}/include"
-	${CMAKE_CURRENT_BINARY_DIR}
-	${PROTOBUF_INCLUDE_DIRS}
-	${ZLIB_INCLUDE_DIRS}
-	CACHE STRING "osmpbf include directories"
-	FORCE
-)
-
 set(OSMPBF_LIBRARIES
 	${PROJECT_NAME}
 	CACHE STRING "osmpbf libraries"
 	FORCE
 )
 
-set(OSMPBF_LINK_LIBRARIES
-	${PROJECT_NAME}
+set(MY_LINK_LIBRARIES
 	${PROTOBUF_LIBRARIES}
 	${ZLIB_LIBRARIES}
+)
+
+set(OSMPBF_LINK_LIBRARIES
+	${PROJECT_NAME}
+	${MY_LINK_LIBRARIES}
 	CACHE STRING "osmpbf link libraries"
 	FORCE
 )
@@ -110,3 +97,5 @@ add_library(${PROJECT_NAME} STATIC
 	${PROTO_SOURCES} ${PROTO_HEADERS}
 	${SOURCES_CPP} ${INCLUDE_HEADERS}
 )
+target_link_libraries(${PROJECT_NAME} PUBLIC ${MY_LINK_LIBRARIES})
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)