songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow branch-build+WITH_examples|WITH_demos on Windows too 

Call bash /full/path/to/cgal_create_cmake_scripts now
This commit is contained in:
Laurent Rineau 2012-01-20 13:36:11 +00:00
parent a1fdcd6170
commit d27f1eec32
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Installation/CMakeLists.txt
View File

@ -40,6 +40,12 @@ if ( CGAL_BRANCH_BUILD )
endif() endif()
endforeach() endforeach()
find_program(CGAL_CREATE_CMAKE_SCRIPT cgal_create_cmake_script
HINT ${CMAKE_SOURCE_DIR}/Scripts/scripts
DOC "Script cgal_create_cmake_script, that creates CMakeLists.txt files"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH)
if (DEFINED CGAL_WRONG_PACKAGES) if (DEFINED CGAL_WRONG_PACKAGES)
message(STATUS "Removed not-a-package: ${CGAL_WRONG_PACKAGES}") message(STATUS "Removed not-a-package: ${CGAL_WRONG_PACKAGES}")
list(REMOVE_ITEM CGAL_CONFIGURED_PACKAGES ${CGAL_WRONG_PACKAGES}) list(REMOVE_ITEM CGAL_CONFIGURED_PACKAGES ${CGAL_WRONG_PACKAGES})
@ -735,14 +741,16 @@ function(process_CGAL_subdirectory entry subdir type_name)
if(EXISTS ${entry}/CMakeLists.txt) if(EXISTS ${entry}/CMakeLists.txt)
add_subdirectory( ${entry} ${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME} ) add_subdirectory( ${entry} ${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME} )
else() else()
# message("cgal_create_cmake_script ${type_name} --source_dir ${entry}") if(CGAL_CREATE_CMAKE_SCRIPT)
execute_process( # message("bah ${CGAL_CREATE_CMAKE_SCRIPT} ${type_name} --source_dir ${entry}")
COMMAND cgal_create_cmake_script ${type_name} --source_dir "${entry}" execute_process(
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}" COMMAND bash ${CGAL_CREATE_CMAKE_SCRIPT} ${type_name} --source_dir "${entry}"
RESULT_VARIABLE RESULT_VAR) WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}"
if(NOT RESULT_VAR) RESULT_VARIABLE RESULT_VAR)
# message("Subdir ${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}") if(NOT RESULT_VAR)
add_subdirectory( "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}" "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}") # message("Subdir ${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}")
add_subdirectory( "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}" "${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}")
endif()
endif() endif()
endif() endif()
else() else()