Skip to content

Commit c8b365a

Browse files
author
Dilawar Singh
committed
Lets test it in fresh docker image.
1 parent 68303fd commit c8b365a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,10 @@ endif( WITH_BOOST )
341341
# See the cmake doc.
342342
# Till then, stay with the old macro.
343343
set(Python_ADDITIONAL_VERSIONS 2.7)
344-
find_package(PythonInterp 3.4)
344+
find_package(PythonInterp 3.5)
345+
if(NOT PYTHONINTERP_FOUND)
346+
find_package(PythonInterp 2.7)
347+
endif()
345348

346349
# This target is built by pymoose/CMakeLists.txt file.
347350
add_subdirectory(pymoose)
@@ -373,10 +376,9 @@ endif()
373376
install(TARGETS moose.bin DESTINATION bin CONFIGURATIONS Debug)
374377
install(TARGETS libmoose DESTINATION lib CONFIGURATIONS Debug)
375378

376-
install(CODE
377-
"execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py --skip-build
378-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})"
379-
)
379+
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py --skip-build
380+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)"
381+
CONFIGURATION Debug Release)
380382

381383
# Print message to start build process
382384
if(${CMAKE_BUILD_TOOL} MATCHES "make")

0 commit comments

Comments
 (0)