iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

checks.cmake: Do not assume CMAKE_PREFIX_PATH

Browse source 
If the user configures the project with a CMAKE_PREFIX_PATH, subprojects
such as xmlversion would not be configured correctly because its
CMAKE_ARGS would expand -DCMAKE_PREFIX_PATH to:

${PROJECT_SOURCE_DIR}/3rdParty ${CMAKE_PREFIX_PATH}

And this whitespace-separated list would be refused when configuring
xmlversion.

This has one side effect: the user is now required to always assign
CMAKE_PREFIX_PATH when configuring the project, and therefore not rely
on the 3rdParty directory to be available from the root directory.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9605 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 9a7d683b5eb19de60403aafb2a89dd46b276b6db
Former-commit-id: 33e2c0fdfe057572b5b4f6e00339b1926cf96602
This commit is contained in:
xavi92 2024-10-27 08:08:24 +00:00
parent 05a7090c6d
commit 4e08c6ae72
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/checks.cmake
View file

@ -122,14 +122,6 @@ ENDMACRO(CHECK_X11_LIBRARIES)
MACRO(CHECK_LIBRARIES)
# Special 3rd Party libraries location for most Windows builds.
IF(WIN32 AND OPTION_CUSTOM_3RDPARTY)
set(SDEXT_CUSTOM_3DPARTY_DIR ${PROJECT_SOURCE_DIR}/3rdParty)
set(CMAKE_PREFIX_PATH ${SDEXT_CUSTOM_3DPARTY_DIR} ${CMAKE_PREFIX_PATH})
ENDIF(WIN32 AND OPTION_CUSTOM_3RDPARTY)
# Now, find libraries as usual with CMake.
IF(UNIX)