From 6b64fdfd4c68e038086d1093e2cd2a7f2293c1b1 Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Sun, 13 Jun 2021 12:16:25 +0000 Subject: [PATCH] - fix internaldeps for ephemeris build git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7567 30fe4595-0a0c-4342-8851-515496e4dcbd --- cmake/internaldeps.cmake | 26 ++++++++++++++++++++------ src/libs/CMakeLists.txt | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/cmake/internaldeps.cmake b/cmake/internaldeps.cmake index ab8d98a0d..84dd544f1 100644 --- a/cmake/internaldeps.cmake +++ b/cmake/internaldeps.cmake @@ -2,7 +2,7 @@ # # file : internaldeps.cmake # copyright : (C) 2008 by Mart Kelder, 2010 by J.-P. Meuret -# web : www.speed-dreams.org +# web : www.speed-dreams.org # version : $Id$ # ############################################################################ @@ -28,10 +28,10 @@ MACRO(ADD_INTERFACE_INCLUDEDIR) ELSE(IN_SOURCETREE) SET(INCLUDE_CANDIDATE ${SD_INCLUDEDIR_ABS}) ENDIF(IN_SOURCETREE) - - FIND_PATH(INTERFACE_INCLUDE_DIR raceman.h + + FIND_PATH(INTERFACE_INCLUDE_DIR raceman.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include NO_DEFAULT_PATH) - FIND_PATH(INTERFACE_INCLUDE_DIR raceman.h + FIND_PATH(INTERFACE_INCLUDE_DIR raceman.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include) MARK_AS_ADVANCED(INTERFACE_INCLUDE_DIR) IF(INTERFACE_INCLUDE_DIR) @@ -123,6 +123,16 @@ MACRO(ADD_SDLIB_INCLUDEDIR) ELSE(NOT OPTION_3RDPARTY_EXPAT) SET(SDLIB_FOUND_LIB FALSE) ENDIF(NOT OPTION_3RDPARTY_EXPAT) + ELSEIF(SDLIB_LIB STREQUAL "ephemeris") + IF(IN_SOURCETREE) + SET(INCLUDE_CANDIDATE ${SOURCE_DIR}/src/libs/ephemeris) + ELSE(IN_SOURCETREE) + SET(INCLUDE_CANDIDATE ${SD_INCLUDEDIR_ABS}) + ENDIF(IN_SOURCETREE) + FIND_PATH(SDLIB_EPHEMERIS_INCLUDE_DIR ephemeris.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include NO_DEFAULT_PATH) + FIND_PATH(SDLIB_EPHEMERIS_INCLUDE_DIR ephemeris.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include) + MARK_AS_ADVANCED(SDLIB_EPHEMERIS_INCLUDE_DIR) + SET(SDLIB_EXTRA_INCLUDEDIR SDLIB_EPHEMERIS_INCLUDE_DIR) ELSEIF(SDLIB_LIB STREQUAL "robottools") IF(IN_SOURCETREE) SET(INCLUDE_CANDIDATE ${SOURCE_DIR}/src/libs/robottools) @@ -230,11 +240,15 @@ MACRO(ADD_SDLIB_LIBRARY TARGET) IF(SDLIB_LIB STREQUAL "txml" AND OPTION_3RDPARTY_EXPAT) SET(SDLIB_IGNORE TRUE) #Ignore: Use Expat ENDIF(SDLIB_LIB STREQUAL "txml" AND OPTION_3RDPARTY_EXPAT) - + + IF(SDLIB_LIB STREQUAL "ephemeris" OR SDLIB_LIB STREQUAL "STATIC") + SET(SDLIB_IGNORE TRUE) + ENDIF(SDLIB_LIB STREQUAL "ephemeris" OR SDLIB_LIB STREQUAL "STATIC") + IF(SDLIB_LIB STREQUAL "solid" AND OPTION_3RDPARTY_SOLID) SET(SDLIB_IGNORE TRUE) #Ignore: Use 3rd party SOLID ENDIF(SDLIB_LIB STREQUAL "solid" AND OPTION_3RDPARTY_SOLID) - + IF(NOT SDLIB_IGNORE) SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX}) diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 2d5521da9..0b1eb97f6 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -14,7 +14,7 @@ ADD_SUBDIRECTORY(portability) # Work-in-progress IF(NOT OPTION_OFFICIAL_ONLY) - SD_ADD_SUBDIRECTORY(ephemeris) -ENDIF() + #ADD_SUBDIRECTORY(ephemeris) +ENDIF(NOT OPTION_OFFICIAL_ONLY)