8000 Fix cmake pathes · VXAPPS/sqlite_functions@618a235 · GitHub
[go: up one dir, main page]

Skip to content

Commit 618a235

Browse files
committed
Fix cmake pathes
1 parent aecae83 commit 618a235

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if (NOT DEFINED SQLITE_MASTER_PROJECT)
4343
endif()
4444

4545
project(sqlite_functions VERSION 0.1 DESCRIPTION "SQLite3 Functions" HOMEPAGE_URL "https://vxapps.com" LANGUAGES C CXX)
46-
include(cmake/env.cmake)
46+
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/env.cmake)
4747
include(${CMAKE}/checks.cmake)
4848
if(SQLITE_MASTER_PROJECT AND CMAKE_BUILD_TYPE STREQUAL "Debug")
4949
include(${CMAKE}/sanitizers.cmake)

cmake/documentation.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
#
3030

31-
# first we can indicate the documentation build as an option and set it to ON by default
32-
option(BUILD_DOC "Build documentation" OFF)
33-
3431
# check if Doxygen is installed
3532
find_package(Doxygen)
33+
find_program(PYTHON_EXECUTABLE NAMES python3 python)
3634

3735
if(DOXYGEN_FOUND)
3836
# set input and output files
@@ -51,7 +49,7 @@ if(DOXYGEN_FOUND)
5149
VERBATIM)
5250

5351
add_custom_target(documentation
54-
COMMAND python ${CMAKE_SOURCE_DIR}/docs/post_doxygen.py ${CMAKE_BINARY_DIR}/docs
52+
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/docs/post_doxygen.py ${CMAKE_BINARY_DIR}/docs
5553
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
5654
COMMENT "Postprocessing documentation"
5755
DEPENDS documentation-generation

cmake/fetch/modern.cpp.core.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
include(FetchContent)
3232

33-
option(CORE_MASTER_PROJECT "Master project" OFF)
34-
option(CORE_BUILD_EXAMPLES "Build examples" OFF)
35-
option(CORE_BUILD_TESTS "Build tests" OFF)
33+
set(CORE_MASTER_PROJECT OFF)
34+
set(CORE_BUILD_EXAMPLES OFF)
35+
set(CORE_BUILD_TESTS OFF)
3636

3737
FetchContent_Declare(modern.cpp.core
3838
GIT_REPOSITORY https://github.com/VXAPPS/modern.cpp.core.git

0 commit comments

Comments
 (0)
0