Merge pull request #19 from dbarrow257/feature_CmkaeFixes

Fix weird cmake problems
dbarrow257 · Sep 17, 2024 · ee5c4d2 · ee5c4d2
2 parents 0d6869e + 8c051ea
commit ee5c4d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,9 +28,9 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 #Can set build dir at configure time with -DCMAKE_INSTALL_PREFIX=/install/path
 if(CMAKE_INSTALL_PREFIX STREQUAL "" OR CMAKE_INSTALL_PREFIX STREQUAL
   "/usr/local")
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
 elseif(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
 endif()
 
 #================================================================================================
@@ -178,7 +178,6 @@ if(${UseCUDAProb3Linear} EQUAL 1)
         EXPORT NuOscillator-targets
         LIBRARY DESTINATION lib/
         PUBLIC_HEADER DESTINATION include/CUDAProb3Beam)
-
 	endif()
 	if(NOT TARGET CUDAProb3Beam OR NOT TARGET CUDAProb3Atmos)
 		cmessage(FATAL_ERROR "Could not find CUDAProb3Linear")

diff --git a/Oscillator/CMakeLists.txt b/Oscillator/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(Oscillator SHARED
         OscillatorFactory.cpp)
 
 
-target_include_directories(Oscillator PRIVATE ../OscProbCalcer PUBLIC
+target_include_directories(Oscillator PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../>
     $<INSTALL_INTERFACE:include>
 )