cleanup

uos · Dec 4, 2023 · 997d47d · 997d47d
1 parent 4fcc0e1
commit 997d47d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 112 deletions.
diff --git a/cmake/rmagine-config.cmake.in b/cmake/rmagine-config.cmake.in
@@ -18,110 +18,11 @@ set(RMAGINE_ROOT_DIR ${PACKAGE_PREFIX_DIR})
 ###########
 ### INCLUDE
 ###########
-set(rmagine_INCLUDE_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
+set(rmagine_INCLUDE_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/rmagine-@rmagine_VERSION@)
 set(rmagine_INCLUDE_DIRS ${rmagine_INCLUDE_DIR})
 
-###########
-### LIBRARY
-###########
-
-# find_package(Eigen3 REQUIRED)
-
-# RMAGINE CORE LIB
-set(rmagine_LIBRARY rmagine-core)
-set(rmagine_LIBRARIES rmagine-core)
-
-# RMAGINE EMBREE LIB
-if(@embree_FOUND@)
-    list(APPEND rmagine_LIBRARIES rmagine-embree)
-    set(rmagine_embree_LIBRARY rmagine-embree)
-else(@embree_FOUND@)
-	#set(rmagine_embree_FOUND 0)
-endif(@embree_FOUND@)
-
-# RMAGINE CUDA LIB
-if(@CUDA_FOUND@)
-    list(APPEND rmagine_LIBRARIES rmagine-cuda)
-    set(rmagine_cuda_LIBRARY rmagine-cuda)
-else(@CUDA_FOUND@)
-    # set(rmagine_cuda_FOUND 0)
-endif(@CUDA_FOUND@)
-
-# RMAGINE OptiX LIB
-if(@OptiX_FOUND@)
-    list(APPEND rmagine_LIBRARIES rmagine-optix)
-    set(rmagine_optix_LIBRARY rmagine-optix)
-else(@OptiX_FOUND@)
-    # set(rmagine_optix_FOUND 0)
-endif(@OptiX_FOUND@)
-
-# Use this?
-set(rmagine_DEFINITIONS @rmagine_DEFINITIONS@)
-
-############
-### EXTERNAL
-############
-find_package(Boost REQUIRED)
-
-# OpenMP
-find_package(OpenMP)
-if(OPENMP_FOUND)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-endif(OPENMP_FOUND)
-
-# Assimp
-list(APPEND rmagine_INCLUDE_DIRS @ASSIMP_INCLUDE_DIRS@)
-set(assimp_DIR @assimp_DIR@)
-find_package(assimp REQUIRED)
-list(APPEND rmagine_LIBRARIES ${ASSIMP_LIBRARIES})
-list(APPEND rmagine_ext_LIBRARIES ${ASSIMP_LIBRARIES})
-
-# Embree
-if(@embree_FOUND@)
-    set(embree_DIR @embree_DIR@)
-
-    set(embree_VERSION_MAJOR 4)
-    find_package(embree ${embree_VERSION_MAJOR})
-    if(embree_FOUND)
-        # NO INCLUDE?
-        if(NOT embree_LIBRARY)
-            if(EMBREE_LIBRARY)
-                set(embree_LIBRARY ${EMBREE_LIBRARY})
-            elseif(Embree_LIBRARY)
-                set(embree_LIBRARY ${Embree_LIBRARY})
-            else()
-                set(embree_LIBRARY embree)
-            endif()
-        endif()
-    else()
-        message(FATAL "Embree not found")
-    endif(embree_FOUND)
-
-    list(APPEND rmagine_LIBRARIES ${embree_LIBRARY})
-    list(APPEND rmagine_ext_LIBRARIES ${embree_LIBRARY})
-endif(@embree_FOUND@)
-
-# CUDA
-if(@CUDA_FOUND@)
-    list(APPEND rmagine_INCLUDE_DIRS @CUDA_INCLUDE_DIRS@)
-    list(APPEND rmagine_LIBRARIES @CUDA_LIBRARIES@)
-    list(APPEND rmagine_LIBRARIES @CUDA_CUDA_LIBRARY@)
-    list(APPEND rmagine_ext_LIBRARIES @CUDA_LIBRARIES@)
-    list(APPEND rmagine_ext_LIBRARIES @CUDA_CUDA_LIBRARY@)
-endif(@CUDA_FOUND@)
-
-if(@OptiX_FOUND@)
-    list(APPEND rmagine_INCLUDE_DIRS @OptiX_INCLUDE_DIRS@)
-    list(APPEND rmagine_LIBRARIES @OptiX_LIBRARIES@)
-    list(APPEND rmagine_ext_LIBRARIES @OptiX_LIBRARIES@)
-endif(@OptiX_FOUND@)
-
 set(rmagine_FOUND TRUE)
 
-# TODO: what things can we remove up to here?
-
 ## COMPONENT STUFF
 set(rmagine_LIBRARIES)
 set(rmagine_COMPONENTS_FOUND)

diff --git a/src/rmagine_core/CMakeLists.txt b/src/rmagine_core/CMakeLists.txt
@@ -32,7 +32,7 @@ add_library(rmagine-core SHARED
 target_include_directories(rmagine-core
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}>
     ${ASSIMP_INCLUDE_DIRS}
 )
 
@@ -99,7 +99,7 @@ install(
 install(
   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/rmagine
   COMPONENT core
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}
 )
 
 set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libeigen3-dev, libassimp-dev" PARENT_SCOPE)

diff --git a/src/rmagine_cuda/CMakeLists.txt b/src/rmagine_cuda/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(rmagine-cuda SHARED
 target_include_directories(rmagine-cuda
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}>
     ${CUDA_INCLUDE_DIRS}
 )
 
@@ -57,7 +57,7 @@ list(APPEND RMAGINE_LIBRARIES rmagine-cuda)
 set(RMAGINE_LIBRARIES ${RMAGINE_LIBRARIES} PARENT_SCOPE)
 
 ###########
-## CUDA
+## INSTALL COMPONENT: CUDA
 ############
 install(TARGETS rmagine-cuda
     EXPORT rmagine-cuda-targets
@@ -82,6 +82,7 @@ configure_package_config_file(cmake/rmagine-cuda-config.cmake.in
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rmagine
 )
 
+# FIND PACKAGE FILES
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/rmagine-cuda-config.cmake
@@ -90,10 +91,11 @@ install(
     COMPONENT cuda
 )
 
+# HEADERS
 install(
   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/rmagine
   COMPONENT cuda
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}
 )
 
 set(CPACK_DEBIAN_CUDA_PACKAGE_DEPENDS "rmagine-core" PARENT_SCOPE)

diff --git a/src/rmagine_embree/CMakeLists.txt b/src/rmagine_embree/CMakeLists.txt
@@ -31,7 +31,7 @@ add_library(rmagine-embree SHARED
 target_include_directories(rmagine-embree
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}>
 )
 
 target_link_libraries(rmagine-embree
@@ -85,6 +85,7 @@ configure_package_config_file(cmake/rmagine-embree-config.cmake.in
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rmagine-${rmagine_VERSION}
 )
 
+# CMAKE FIND PACKAGE FILES
 install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/rmagine-embree-config.cmake
@@ -93,10 +94,11 @@ install(
   COMPONENT embree
 )
 
+# HEADERS
 install(
   DIRECTORY include/rmagine
   COMPONENT embree
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}
 )
 
 set(CPACK_DEBIAN_EMBREE_PACKAGE_DEPENDS "rmagine-core" PARENT_SCOPE)

diff --git a/src/rmagine_optix/CMakeLists.txt b/src/rmagine_optix/CMakeLists.txt
@@ -5,9 +5,6 @@ set(RMAGINE_OPTIX_PTX_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/rmagine_optix_ptx")
 set(RMAGINE_OPTIX_PTX_GLOB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rmagine_optix_ptx")
 
 set(CUDA_GENERATED_OUTPUT_DIR ${RMAGINE_OPTIX_PTX_DIR})
-add_definitions( -DRMAGINE_OPTIX_PTX_DIR="${RMAGINE_OPTIX_PTX_DIR}" )
-add_definitions( -DRMAGINE_OPTIX_PTX_GLOB_DIR="${RMAGINE_OPTIX_PTX_GLOB_DIR}")
-
 # message(STATUS "Writing Optix Kernels to ${RMAGINE_OPTIX_PTX_DIR}")
 
 set(OPTIX_KERNEL_FILES
@@ -88,10 +85,15 @@ add_library(rmagine-optix SHARED
     ${RMAGINE_OPTIX_SRCS}
 )
 
+target_compile_definitions(rmagine-optix PRIVATE 
+    RMAGINE_OPTIX_PTX_GLOB_DIR="${RMAGINE_OPTIX_PTX_GLOB_DIR}"
+    RMAGINE_OPTIX_PTX_DIR="${RMAGINE_OPTIX_PTX_DIR}"
+)
+
 target_include_directories(rmagine-optix PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}>
 )
 
 target_include_directories(rmagine-optix PRIVATE
@@ -148,6 +150,7 @@ configure_package_config_file(cmake/rmagine-optix-config.cmake.in
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rmagine-${rmagine_VERSION}
 )
 
+# FIND PACKAGE FILES
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/rmagine-optix-config.cmake
@@ -156,10 +159,11 @@ install(
     COMPONENT optix
 )
 
+# HEADERS
 install(
   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/rmagine
   COMPONENT optix
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rmagine-${rmagine_VERSION}
 )