From f8551e51be0e5fba6be220afb2efdfea6c3ad4dc Mon Sep 17 00:00:00 2001 From: Dan Ibanez <dan.a.ibanez@gmail.com> Date: Sat, 16 Jul 2016 10:02:04 -0400 Subject: [PATCH] few more package changes, trying config now... --- dsp/CMakeLists.txt | 15 +++++---------- omega_h/CMakeLists.txt | 19 +++++++------------ viz/CMakeLists.txt | 23 ++++++++++------------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dsp/CMakeLists.txt b/dsp/CMakeLists.txt index d7ba641c9..79a51c68f 100644 --- a/dsp/CMakeLists.txt +++ b/dsp/CMakeLists.txt @@ -26,20 +26,15 @@ set(HEADERS add_library(dsp ${SOURCES}) # Include directories -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} -) +target_include_directories(apf INTERFACE + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include> + ) # Link this package to these libraries -target_link_libraries(dsp ma) +target_link_libraries(dsp PRIVATE ma PUBLIC apf) # Tell CMake to add this package to the SCOREC project -set_property( - TARGET dsp - APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include> -) install(TARGETS dsp EXPORT dsp-targets DESTINATION lib) install(FILES ${HEADERS} DESTINATION include) install(EXPORT dsp-targets DESTINATION lib/scorec) diff --git a/omega_h/CMakeLists.txt b/omega_h/CMakeLists.txt index f9f4a83c8..b10a83267 100644 --- a/omega_h/CMakeLists.txt +++ b/omega_h/CMakeLists.txt @@ -14,7 +14,7 @@ if(NOT EXISTS "${OMEGA_H_INCLUDE_DIR}") endif() find_library(OMEGA_H_LIB omega_h) if(NOT EXISTS "${OMEGA_H_LIB}") - message(FATAL_ERROR "Omega_h library not found") + message(FATAL_ERROR "Omega_h library not found") endif() # Package sources @@ -31,21 +31,16 @@ set(SOURCES add_library(apf_omega_h ${SOURCES}) # Include directories -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${OMEGA_H_INCLUDE_DIR} -) +target_include_directories(apf_omega_h INTERFACE + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include> + ) +target_include_directories(apf_omega_h PUBLIC ${OMEGA_H_INCLUDE_DIR}) # Link this package to these libraries -target_link_libraries(apf_omega_h mds apf ${OMEGA_H_LIB}) +target_link_libraries(apf_omega_h PUBLIC apf ${OMEGA_H_LIB} PRIVATE mds) # Tell CMake to add this package to the SCOREC project -set_property( - TARGET apf_omega_h - APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include> -) install(TARGETS apf_omega_h EXPORT apf_omega_h-targets DESTINATION lib) install(FILES ${HEADERS} DESTINATION include) install(EXPORT apf_omega_h-targets DESTINATION lib/scorec) diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 0098bd0d5..c03d9dc89 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -14,7 +14,7 @@ if(NOT EXISTS "${MILO_INCLUDE_DIR}") endif() find_library(MILO_LIB NAMES milo) if(NOT EXISTS "${MILO_LIB}") - message(FATAL_ERROR "milo library not found") + message(FATAL_ERROR "milo library not found") endif() # Package sources @@ -30,22 +30,19 @@ set(HEADERS # Add the viz library add_library(viz ${SOURCES}) -# Inlcude directories -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${MILO_INCLUDE_DIR} -) +# Include directories +target_include_directories(apf INTERFACE + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include> + ) +target_include_directories(apf PRIVATE + ${MILO_INCLUDE_DIR} + ) # Link this package to these libraries -target_link_libraries(viz apf ${MILO_LIB}) +target_link_libraries(viz PRIVATE apf ${MILO_LIB}) # Tell CMake to add this package to the SCOREC project -set_property( - TARGET viz - APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include> -) install(TARGETS viz EXPORT viz-targets DESTINATION lib) install(FILES ${HEADERS} DESTINATION include) install(EXPORT viz-targets DESTINATION lib/scorec)