Correct pathes detection.
This commit is contained in:
parent
4019e36ddc
commit
b1aae7ae77
|
@ -35,20 +35,16 @@ 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)
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
qt4_add_resources ( RCC_SRCS Unicorn.qrc )
|
qt4_add_resources ( RCC_SRCS Unicorn.qrc )
|
||||||
|
|
||||||
add_library ( unicorn ${cpps} ${MOCcpps} )
|
add_library ( unicorn ${cpps} ${MOCcpps} )
|
||||||
target_link_libraries ( unicorn #${SOLSTICE_GRAPHICAL_LIBRARIES}
|
target_link_libraries ( unicorn ${SOLSTICE_GRAPHICAL_LIBRARIES}
|
||||||
#${SOLSTICE_LIBRARIES}
|
${SOLSTICE_LIBRARIES}
|
||||||
#${EQUINOX_GRAPHICAL_LIBRARIES}
|
${EQUINOX_GRAPHICAL_LIBRARIES}
|
||||||
#${EQUINOX_LIBRARIES}
|
${EQUINOX_LIBRARIES}
|
||||||
${KITE_GRAPHICAL_LIBRARIES}
|
${KITE_GRAPHICAL_LIBRARIES}
|
||||||
${KITE_LIBRARIES}
|
${KITE_LIBRARIES}
|
||||||
${KATABATIC_GRAPHICAL_LIBRARIES}
|
${KATABATIC_GRAPHICAL_LIBRARIES}
|
||||||
|
|
Loading…
Reference in New Issue