From 819492e080a07bbdeef22fd2e3cf8c1e34f696cf Mon Sep 17 00:00:00 2001 From: Arnav Borborah Date: Thu, 12 Apr 2018 13:23:47 -0400 Subject: [PATCH 1/5] Use absolute path to example file --- test/find-package-test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt index 77d5831..c10d58e 100644 --- a/test/find-package-test/CMakeLists.txt +++ b/test/find-package-test/CMakeLists.txt @@ -7,5 +7,5 @@ set(CMAKE_CXX_EXTENSIONS OFF) find_package(cxxopts REQUIRED) -add_executable(library-test "../../src/example.cpp") +add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts::cxxopts) From a7a09535ec98d7ba193fa58a0ee4d04a81563ed1 Mon Sep 17 00:00:00 2001 From: Arnav Borborah Date: Thu, 12 Apr 2018 13:24:29 -0400 Subject: [PATCH 2/5] Use absolute path to example file --- test/add-subdirectory-test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt index 6c92299..0fd6821 100644 --- a/test/add-subdirectory-test/CMakeLists.txt +++ b/test/add-subdirectory-test/CMakeLists.txt @@ -7,5 +7,5 @@ set(CMAKE_CXX_EXTENSIONS OFF) add_subdirectory(../.. cxxopts EXCLUDE_FROM_ALL) -add_executable(library-test "../../src/example.cpp") +add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts) From 9ee500461c7e8dc392c2ae80d04355e329cfdd83 Mon Sep 17 00:00:00 2001 From: Arnav Borborah Date: Thu, 12 Apr 2018 13:25:19 -0400 Subject: [PATCH 3/5] Use absolute path for project --- test/add-subdirectory-test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt index 0fd6821..d669d79 100644 --- a/test/add-subdirectory-test/CMakeLists.txt +++ b/test/add-subdirectory-test/CMakeLists.txt @@ -5,7 +5,7 @@ project(cxxopts-test) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) -add_subdirectory(../.. cxxopts EXCLUDE_FROM_ALL) +add_subdirectory(${PROJECT_SOURCE_DIR} cxxopts EXCLUDE_FROM_ALL) add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts) From 7130882cac150e4bf53b162dd9d16bac1304a00e Mon Sep 17 00:00:00 2001 From: arnavb11 Date: Fri, 13 Apr 2018 01:05:27 +0000 Subject: [PATCH 4/5] Revert "Use absolute path for project" This reverts commit 9ee500461c7e8dc392c2ae80d04355e329cfdd83. --- test/add-subdirectory-test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt index d669d79..0fd6821 100644 --- a/test/add-subdirectory-test/CMakeLists.txt +++ b/test/add-subdirectory-test/CMakeLists.txt @@ -5,7 +5,7 @@ project(cxxopts-test) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) -add_subdirectory(${PROJECT_SOURCE_DIR} cxxopts EXCLUDE_FROM_ALL) +add_subdirectory(../.. cxxopts EXCLUDE_FROM_ALL) add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts) From 93f4cd5f8c96471ee93ab7d2154a5b7940fd58b8 Mon Sep 17 00:00:00 2001 From: arnavb11 Date: Fri, 13 Apr 2018 01:10:50 +0000 Subject: [PATCH 5/5] Fix: Refer to _top_ level CMake source directory --- test/add-subdirectory-test/CMakeLists.txt | 4 ++-- test/find-package-test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt index 0fd6821..3c992ca 100644 --- a/test/add-subdirectory-test/CMakeLists.txt +++ b/test/add-subdirectory-test/CMakeLists.txt @@ -5,7 +5,7 @@ project(cxxopts-test) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) -add_subdirectory(../.. cxxopts EXCLUDE_FROM_ALL) +add_subdirectory(${CMAKE_SOURCE_DIR} cxxopts EXCLUDE_FROM_ALL) -add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") +add_executable(library-test "${CMAKE_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts) diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt index c10d58e..329de3d 100644 --- a/test/find-package-test/CMakeLists.txt +++ b/test/find-package-test/CMakeLists.txt @@ -7,5 +7,5 @@ set(CMAKE_CXX_EXTENSIONS OFF) find_package(cxxopts REQUIRED) -add_executable(library-test "${PROJECT_SOURCE_DIR}/src/example.cpp") +add_executable(library-test "${CMAKE_SOURCE_DIR}/src/example.cpp") target_link_libraries(library-test cxxopts::cxxopts)