From 3c672c4a53c6b90ce41c617c53430d404c6c86d8 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Fri, 5 Oct 2018 12:06:06 +0200 Subject: [PATCH] fix to full path ? CLion ? CMake ? me ? have problem with relative path? --- CMakeLists.txt | 16 ++++++++-------- build/cmake/select_filesystem.cmake | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6017cfe..080b2952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,16 +130,16 @@ if(NANA_CMAKE_AUTOMATIC_GUI_TESTING) endif() list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/build/cmake/Modules) -include(build/cmake/install_nana.cmake) # includes and libs, or just expose the nana target -include(build/cmake/OS.cmake) # windows, unix, linux, apple, ... -include(build/cmake/shared_libs.cmake) # static and shared -include(build/cmake/compilers.cmake) # VC, gcc, clang +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/install_nana.cmake) # includes and libs, or just expose the nana target +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/OS.cmake) # windows, unix, linux, apple, ... +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/shared_libs.cmake) # static and shared +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/compilers.cmake) # VC, gcc, clang ############# Optional libraries ##################### -include(build/cmake/enable_png.cmake) -include(build/cmake/enable_jpeg.cmake) -include(build/cmake/enable_audio.cmake) -include(build/cmake/select_filesystem.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/enable_png.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/enable_jpeg.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/enable_audio.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/build/cmake/select_filesystem.cmake) if (NANA_CMAKE_VERBOSE_PREPROCESSOR) diff --git a/build/cmake/select_filesystem.cmake b/build/cmake/select_filesystem.cmake index 036cf050..974ae7d1 100644 --- a/build/cmake/select_filesystem.cmake +++ b/build/cmake/select_filesystem.cmake @@ -11,10 +11,10 @@ # the previus were selected or available. # You can change that default if you change one of the following # (please don't define more than one of the _XX_FORCE options): -option(NANA_CMAKE_FIND_BOOST_FILESYSTEM "Search: Is Boost filesystem available?" OFF) option(NANA_CMAKE_NANA_FILESYSTEM_FORCE "Force nana filesystem over ISO and boost?" OFF) option(NANA_CMAKE_STD_FILESYSTEM_FORCE "Use of STD filesystem?(a compilation error will ocurre if not available)" OFF) option(NANA_CMAKE_BOOST_FILESYSTEM_FORCE "Force use of Boost filesystem if available (over STD)?" OFF) +option(NANA_CMAKE_FIND_BOOST_FILESYSTEM "Search: Is Boost filesystem available?" OFF) if(NANA_CMAKE_NANA_FILESYSTEM_FORCE) target_compile_definitions(nana PUBLIC NANA_FILESYSTEM_FORCE)