Cleanup build installation directories
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 May 2018 06:35:00 +0000 (08:35 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 May 2018 06:35:00 +0000 (08:35 +0200)
cmake/cc_flags.cmake
cmake/declare_library.cmake
cmake/lib_config.cmake

index adc5d98..02f351c 100644 (file)
@@ -78,9 +78,9 @@ IF (WIN32)
 ENDIF(WIN32)
 
 # create all data inside the build directory
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # set release specific compiler options
 set(CMAKE_C_FLAGS_DEBUG "-g")
index 0edebd2..aa8e9c3 100644 (file)
@@ -24,7 +24,7 @@ function (oonf_create_library libname source include link_internal linkto_extern
     endif (linkto_external)
     
     install(TARGETS oonf_${libname} LIBRARY
-                                    DESTINATION lib
+                                    DESTINATION ${INSTALL_LIB_DIR}
                                     COMPONENT component_oonf_${libname})
     
     ADD_CUSTOM_TARGET(install_oonf_${libname}
index 8cd74fd..c829bfa 100644 (file)
@@ -32,7 +32,7 @@ set (OONF_SANITIZE false CACHE BOOL
 
 set (INSTALL_LIB_DIR        lib/oonf)
 set (INSTALL_PKGCONFIG_DIR  lib/pkgconfig)
-set (INSTALL_INCLUDE_DIR    include/oonf)
+set (INSTALL_INCLUDE_DIR    include)
 set (INSTALL_CMAKE_DIR      ${DEF_INSTALL_CMAKE_DIR})
 
 ####################################