Correct pathes detection.
This commit is contained in:
parent
29dd5a96fa
commit
8d764a8497
|
@ -19,25 +19,26 @@ MACRO(SETUP_PROJECT_PATHS project)
|
||||||
IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
|
IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
|
||||||
MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
|
MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
|
||||||
SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
|
SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
|
||||||
LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
|
LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
|
||||||
IF( DIR_INDEX LESS 0)
|
|
||||||
LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
|
|
||||||
ENDIF( DIR_INDEX LESS 0)
|
|
||||||
ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
|
ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
|
||||||
|
|
||||||
IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
|
IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
|
||||||
MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
|
MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
|
||||||
SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/")
|
SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/")
|
||||||
LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
|
LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
|
||||||
IF( DIR_INDEX LESS 0)
|
|
||||||
LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
|
|
||||||
ENDIF( DIR_INDEX LESS 0)
|
|
||||||
ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
|
ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
|
||||||
|
|
||||||
|
LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
|
||||||
ENDMACRO(SETUP_PROJECT_PATHS project)
|
ENDMACRO(SETUP_PROJECT_PATHS project)
|
||||||
|
|
||||||
SETUP_PROJECT_PATHS(IO)
|
SETUP_PROJECT_PATHS(IO)
|
||||||
SETUP_PROJECT_PATHS(CORIOLIS)
|
SETUP_PROJECT_PATHS(CORIOLIS)
|
||||||
|
|
||||||
|
MESSAGE("-- Components of CMAKE_MODULE_PATH:")
|
||||||
|
FOREACH(PATH IN LISTS CMAKE_MODULE_PATH)
|
||||||
|
MESSAGE("-- ${PATH}")
|
||||||
|
ENDFOREACH(PATH)
|
||||||
|
|
||||||
SET(QT_USE_QTXML "true")
|
SET(QT_USE_QTXML "true")
|
||||||
|
|
||||||
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
|
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
|
||||||
|
|
Loading…
Reference in New Issue