Skip to content
Snippets Groups Projects
Commit 80f15ff6 authored by Andrea Censi's avatar Andrea Censi
Browse files

Merge pull request #5 from galou/out_of_source_config 

Configure in build space
parents f959dbc4 967d8d3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sm/CMakeLists.txt
+ 1
− 0
View file @ 80f15ff6
...@@ -3,6 +3,7 @@ PROJECT (CSM C CXX) ...@@ -3,6 +3,7 @@ PROJECT (CSM C CXX)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
cmake_minimum_required(VERSION 2.4) cmake_minimum_required(VERSION 2.4)
set(csm_link_flags "-L.") set(csm_link_flags "-L.")
......
sm/lib/json-c/CMakeLists.txt
+ 2
− 1
View file @ 80f15ff6
...@@ -24,6 +24,7 @@ TARGET_LINK_LIBRARIES(test2 json-c) ...@@ -24,6 +24,7 @@ TARGET_LINK_LIBRARIES(test2 json-c)
FILE(GLOB json_headers "*.h") FILE(GLOB json_headers "*.h")
SET(json_headers ${json_headers} ${CMAKE_BINARY_DIR}/config.h)
INSTALL(FILES ${json_headers} DESTINATION include/json-c) INSTALL(FILES ${json_headers} DESTINATION include/json-c)
...@@ -78,4 +79,4 @@ MY_CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF) ...@@ -78,4 +79,4 @@ MY_CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
MY_CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF) MY_CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
MY_CHECK_FUNCTION_EXISTS(vsyslog HAVE_VSYSLOG) MY_CHECK_FUNCTION_EXISTS(vsyslog HAVE_VSYSLOG)
CONFIGURE_FILE(config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment