Unverified Commit ad35a5c7 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #883

Fix cmake output dir checks
parents bc496094 f622e038
...@@ -159,14 +159,14 @@ endif() ...@@ -159,14 +159,14 @@ endif()
# set module path appropriately # set module path appropriately
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# set binary output path if not defined by user # set binary output path if not defined by user
if(EXECUTABLE_OUTPUT_PATH STREQUAL "") if(NOT EXECUTABLE_OUTPUT_PATH)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin")
endif() endif()
# set library output path if not defined by user, but always set # set library output path if not defined by user, but always set
# library output path to binary output path for Xcode projects # library output path to binary output path for Xcode projects
if(CMAKE_GENERATOR STREQUAL "Xcode") if(CMAKE_GENERATOR STREQUAL "Xcode")
set(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}") set(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}")
elseif(LIBRARY_OUTPUT_PATH STREQUAL "") elseif(NOT LIBRARY_OUTPUT_PATH)
set(LIBRARY_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib") set(LIBRARY_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib")
endif() endif()
......
...@@ -88,7 +88,7 @@ config = [ ...@@ -88,7 +88,7 @@ config = [
], ],
// Configures what binary the coverage report uses and what paths to exclude. // Configures what binary the coverage report uses and what paths to exclude.
coverage: [ coverage: [
binary: 'build/caf-test', binary: 'build/bin/caf-test',
relativeExcludePaths: [ relativeExcludePaths: [
'examples', 'examples',
'tools', 'tools',
......
...@@ -91,7 +91,8 @@ foreach (comp ${CAF_FIND_COMPONENTS}) ...@@ -91,7 +91,8 @@ foreach (comp ${CAF_FIND_COMPONENTS})
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
/sw/lib /sw/lib
${CMAKE_INSTALL_PREFIX}/lib) ${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_BUILD_TYPE})
mark_as_advanced(CAF_LIBRARY_${UPPERCOMP}) mark_as_advanced(CAF_LIBRARY_${UPPERCOMP})
if ("${CAF_LIBRARY_${UPPERCOMP}}" if ("${CAF_LIBRARY_${UPPERCOMP}}"
STREQUAL "CAF_LIBRARY_${UPPERCOMP}-NOTFOUND") STREQUAL "CAF_LIBRARY_${UPPERCOMP}-NOTFOUND")
......
Markdown is supported
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