From 8c051ea15c8fd77d6383cd28f849950ee0b6c637 Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Tue, 17 Sep 2024 16:07:45 +0000 Subject: [PATCH] Fix weird cmake problems --- CMakeLists.txt | 5 ++--- Oscillator/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91cb7aa..f0c5604 100644 --- 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 index 741d87a..3a928b3 100644 --- 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 $ $ )