Skip to content

Commit e8e5e31

Browse files
committed
Merge branch 'update/cmake' into 'main'
Add a find_package(Python3 required) to solve an installation issue See merge request njoy/ACEtk!28
2 parents 7fc3b05 + 49dc90b commit e8e5e31

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ endif()
146146

147147
# enable Edit and Continue in Visual Studio (for debugging)
148148
if(MSVC)
149-
target_compile_options(${PROJECT_NAME} INTERFACE "/ZI")
150-
target_link_options(${PROJECT_NAME} INTERFACE "/INCREMENTAL")
149+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
150+
target_compile_options(${PROJECT_NAME} INTERFACE "/ZI")
151+
target_link_options(${PROJECT_NAME} INTERFACE "/INCREMENTAL")
152+
endif()
151153
endif()

cmake/dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include( shacl_FetchContent )
88

99
shacl_FetchContent_Declare( tools
1010
GIT_REPOSITORY ../../njoy/tools
11-
GIT_TAG 902cf189f7a28012945577a9f77180a516e0e978 # tag: v0.4.3
11+
GIT_TAG 22bae7709d012914f32c99c0fb7aab06f49c5f62 # tag: v0.4.3
1212
)
1313

1414
#######################################################################

python/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
if(ACEtk.python)
22

3+
find_package( Python3 REQUIRED )
34
pybind11_add_module( ACEtk.python
45
${CMAKE_CURRENT_SOURCE_DIR}/src/ACEtk.python.cpp
56
${CMAKE_CURRENT_SOURCE_DIR}/src/XsdirEntry.python.cpp

0 commit comments

Comments
 (0)