Skip to content

Commit 86d80f3

Browse files
committed
move CMake related files to cmake dir
See #138 (cherry picked from commit 57a7114)
1 parent 7fc4991 commit 86d80f3

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1212
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1313

1414
option(BUILD_SHARED_LIBS "Build shared library" ON)
15+
option(BUILD_TESTING "Build and run tests" OFF)
1516

1617
# Custom project options
1718
set(V8PP_HEADER_ONLY 0 CACHE BOOL "Header-only library")
@@ -20,8 +21,9 @@ set(V8PP_PLUGIN_INIT_PROC_NAME "v8pp_module_init" CACHE STRING "v8pp plugin init
2021
set(V8PP_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX} CACHE STRING "v8pp plugin filename suffix")
2122

2223
add_subdirectory(v8pp)
23-
add_subdirectory(plugins)
24+
2425
if(BUILD_TESTING)
2526
enable_testing()
27+
add_subdirectory(plugins)
2628
add_subdirectory(test)
2729
endif()
File renamed without changes.

FindV8.cmake cmake/FindV8.cmake

File renamed without changes.

v8pp/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# v8pp target
22

3-
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
3+
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
44
find_package(V8 REQUIRED)
55

66
configure_file(config.hpp.in config.hpp)
@@ -83,7 +83,7 @@ include(GNUInstallDirs)
8383
include(CMakePackageConfigHelpers)
8484

8585
write_basic_package_version_file("${PROJECT_BINARY_DIR}/ConfigVersion.cmake" COMPATIBILITY SameMajorVersion)
86-
configure_package_config_file("${PROJECT_SOURCE_DIR}/Config.cmake.in" "${PROJECT_BINARY_DIR}/Config.cmake"
86+
configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${PROJECT_BINARY_DIR}/Config.cmake"
8787
INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/v8pp/cmake)
8888

8989
install(TARGETS v8pp EXPORT v8pp_Targets)

0 commit comments

Comments
 (0)