Skip to content

Commit e2f96e5

Browse files
bnbailey-pslbnbailey-psl
committed
Update plugins cmake
1 parent 5d0ef4f commit e2f96e5

File tree

13 files changed

+150
-74
lines changed

13 files changed

+150
-74
lines changed

‎plugins/aeriallidar/CMakeLists.txt‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
include_directories(../visualizer/include)
8-
include_directories(../visualizer/lib/glm)
95

106
if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
117
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")
@@ -35,11 +31,23 @@ SET( CUDA_PROPAGATE_HOST_FLAGS OFF )
3531

3632
CUDA_ADD_LIBRARY( aeriallidar STATIC "src/AerialLiDAR.cu" "src/AerialLiDAR.cpp" "src/fileIO.cpp" "src/selfTest.cpp" "../../core/src/pugixml.cpp" )
3733

38-
include_directories("${CUDA_INCLUDE_DIRS}")
39-
target_link_libraries( aeriallidar ${CUDA_LIBRARIES} )
34+
target_include_directories(aeriallidar
35+
PUBLIC
36+
${CMAKE_CURRENT_SOURCE_DIR}/include
37+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
38+
${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/include
39+
${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/lib/glm
40+
${CUDA_INCLUDE_DIRS}
41+
)
42+
43+
target_link_libraries( aeriallidar
44+
PRIVATE
45+
helios
46+
${CUDA_LIBRARIES}
47+
visualizer
48+
)
4049

4150
#add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/ "plugins/visualizer" )
42-
target_link_libraries( aeriallidar visualizer )
4351
add_dependencies( aeriallidar visualizer )
4452

4553
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${CUDA_INCLUDE_DIRS};${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )

‎plugins/boundarylayerconductance/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
85
add_library( boundarylayerconductance STATIC "src/BoundaryLayerConductanceModel.cpp" )
96

7+
target_include_directories(boundarylayerconductance
8+
PUBLIC
9+
${CMAKE_CURRENT_SOURCE_DIR}/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
11+
)
12+
13+
target_link_libraries(boundarylayerconductance PRIVATE helios)
14+
1015
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
1116

‎plugins/canopygenerator/CMakeLists.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
8-
add_library( canopygenerator STATIC "src/CanopyGenerator.cpp;src/grapevine.cpp;src/whitespruce.cpp;src/tomato.cpp;src/strawberry.cpp;src/walnut.cpp;src/sorghum.cpp;src/bean.cpp")
5+
add_library( canopygenerator STATIC "src/CanopyGenerator.cpp;src/grapevine.cpp;src/whitespruce.cpp;src/tomato.cpp;src/strawberry.cpp;src/walnut.cpp;src/sorghum.cpp;src/bean.cpp")
6+
7+
target_include_directories(canopygenerator
8+
PUBLIC
9+
${CMAKE_CURRENT_SOURCE_DIR}/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
11+
)
12+
13+
target_link_libraries(canopygenerator PRIVATE helios)
914

1015
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
1116

‎plugins/energybalance/CMakeLists.txt‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22
project(helios)
33

4-
include_directories(include)
5-
include_directories(../../core/include)
64

75
if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
86
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")
@@ -34,7 +32,17 @@ SET( CUDA_PROPAGATE_HOST_FLAGS OFF )
3432

3533
CUDA_ADD_LIBRARY( energybalance STATIC "src/EnergyBalanceModel.cpp" "src/EnergyBalanceModel.cu" "src/selfTest.cpp" )
3634

37-
include_directories("${CUDA_INCLUDE_DIRS}")
38-
target_link_libraries( energybalance ${CUDA_LIBRARIES} )
35+
target_include_directories(energybalance
36+
PUBLIC
37+
${CMAKE_CURRENT_SOURCE_DIR}/include
38+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
39+
${CUDA_INCLUDE_DIRS}
40+
)
41+
42+
target_link_libraries( energybalance
43+
PRIVATE
44+
helios
45+
${CUDA_LIBRARIES}
46+
)
3947

4048
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${CUDA_INCLUDE_DIRS};${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )

‎plugins/leafoptics/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
85
add_library( leafoptics STATIC "src/LeafOptics.cpp" )
96

7+
target_include_directories(leafoptics
8+
PUBLIC
9+
${CMAKE_CURRENT_SOURCE_DIR}/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
11+
)
12+
13+
target_link_libraries(leafoptics PRIVATE helios)
14+
1015
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
1116

1217
file( COPY spectral_data DESTINATION ${CMAKE_BINARY_DIR}/plugins/leafoptics/ )

‎plugins/lidar/CMakeLists.txt‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
include_directories(../visualizer/include)
8-
include_directories(../visualizer/lib/glm)
95

106
if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
117
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")
@@ -37,12 +33,24 @@ SET( CUDA_PROPAGATE_HOST_FLAGS OFF )
3733

3834
CUDA_ADD_LIBRARY( lidar STATIC "src/LiDAR.cu" "src/LiDAR.cpp" "src/fileIO.cpp" "src/selfTest.cpp" "../../core/src/pugixml.cpp" "lib/s_hull_pro/s_hull_pro.cpp" )
3935

40-
include_directories("${CUDA_INCLUDE_DIRS}")
41-
include_directories("lib/s_hull_pro")
42-
target_link_libraries( lidar ${CUDA_LIBRARIES} )
36+
target_include_directories(lidar
37+
PUBLIC
38+
${CMAKE_CURRENT_SOURCE_DIR}/include
39+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
40+
${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/include
41+
${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/lib/glm
42+
${CMAKE_CURRENT_SOURCE_DIR}/lib/s_hull_pro
43+
${CUDA_INCLUDE_DIRS}
44+
)
45+
46+
target_link_libraries( lidar
47+
PRIVATE
48+
helios
49+
${CUDA_LIBRARIES}
50+
visualizer
51+
)
4352

4453
#add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/../visualizer/ "plugins/visualizer" )
45-
target_link_libraries( lidar visualizer )
4654
add_dependencies( lidar visualizer )
4755

4856
#add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/lib/laszip" )

‎plugins/photosynthesis/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
85
add_library( photosynthesis STATIC "src/PhotosynthesisModel.cpp" )
96

7+
target_include_directories(photosynthesis
8+
PUBLIC
9+
${CMAKE_CURRENT_SOURCE_DIR}/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
11+
)
12+
13+
target_link_libraries(photosynthesis PRIVATE helios)
14+
1015
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
1116

‎plugins/planthydraulics/CMakeLists.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
75

86
add_library(planthydraulics STATIC "src/PlantHydraulicsModel.cpp" "src/selfTest.cpp")
97

8+
target_include_directories(planthydraulics
9+
PUBLIC
10+
${CMAKE_CURRENT_SOURCE_DIR}/include
11+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
12+
)
13+
14+
target_link_libraries(planthydraulics PRIVATE helios)
15+
1016
set(PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE)

‎plugins/radiation/CMakeLists.txt‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
75

86
if(NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
97
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings")
@@ -13,10 +11,16 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Mo
1311

1412
add_library(radiation STATIC "src/RadiationModel.cpp;src/selfTest.cpp;src/CameraCalibration.cpp;")
1513

14+
target_include_directories(radiation
15+
PUBLIC
16+
${CMAKE_CURRENT_SOURCE_DIR}/include
17+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
18+
)
19+
1620
find_package(CUDA REQUIRED)
1721
if(CUDA_FOUND)
18-
include_directories(${CUDA_INCLUDE_DIRS})
19-
target_link_libraries( radiation ${CUDA_LIBRARIES} )
22+
target_include_directories(radiation PUBLIC ${CUDA_INCLUDE_DIRS})
23+
target_link_libraries( radiation PRIVATE helios ${CUDA_LIBRARIES} )
2024
endif(CUDA_FOUND)
2125

2226
if(UNIX AND NOT APPLE)
@@ -27,15 +31,15 @@ if(UNIX AND NOT APPLE)
2731
set(OPTIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/OptiX/linux64-6.5.0/)
2832
message("Using OptiX version 6.5")
2933
endif()
30-
include_directories(${OPTIX_PATH}include)
31-
add_subdirectory(${OPTIX_PATH} "plugins/radiation")
32-
target_link_libraries( radiation ${OPTIX_PATH}lib64/liboptix.so )
34+
target_include_directories(radiation PUBLIC ${OPTIX_PATH}include)
35+
add_subdirectory(${OPTIX_PATH} "plugins/radiation")
36+
target_link_libraries( radiation ${OPTIX_PATH}lib64/liboptix.so )
3337
endif(UNIX AND NOT APPLE)
3438
if(APPLE)
3539
set(OPTIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/OptiX/mac64-4.0.2/)
36-
include_directories(${OPTIX_PATH}include)
37-
add_subdirectory(${OPTIX_PATH})
38-
target_link_libraries( radiation ${OPTIX_PATH}lib64/liboptix.dylib )
40+
target_include_directories(radiation PUBLIC ${OPTIX_PATH}include)
41+
add_subdirectory(${OPTIX_PATH})
42+
target_link_libraries( radiation ${OPTIX_PATH}lib64/liboptix.dylib )
3943
endif(APPLE)
4044
if(WIN32)
4145
if( OPTIX_VERSION_LEGACY )
@@ -49,8 +53,8 @@ if(WIN32)
4953
set(OPTIX_DLL "optix.6.5.0.dll")
5054
message("Using OptiX version 6.5")
5155
endif()
52-
include_directories(${OPTIX_PATH}include)
53-
target_link_libraries( radiation "${OPTIX_PATH}lib64/${OPTIX_LIB}" )
56+
target_include_directories(radiation PUBLIC ${OPTIX_PATH}include)
57+
target_link_libraries( radiation "${OPTIX_PATH}lib64/${OPTIX_LIB}" )
5458
add_custom_command( TARGET radiation POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${OPTIX_PATH}lib64/${OPTIX_LIB}" "${CMAKE_BINARY_DIR}/." )
5559
add_custom_command( TARGET radiation POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${OPTIX_PATH}bin64/${OPTIX_DLL}" "${CMAKE_BINARY_DIR}/." )
5660

‎plugins/solarposition/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
cmake_minimum_required(VERSION 2.0)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(helios)
44

5-
include_directories(include)
6-
include_directories(../../core/include)
7-
85
add_library( solarposition STATIC "src/SolarPosition.cpp" "src/selfTest.cpp" )
96

7+
target_include_directories(solarposition
8+
PUBLIC
9+
${CMAKE_CURRENT_SOURCE_DIR}/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/include
11+
)
12+
13+
target_link_libraries(solarposition PRIVATE helios)
14+
1015
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )
1116

0 commit comments

Comments
 (0)