fly/flightgear
1
0
Fork 0
Code Activity

Cmake: use debug version of plib when building in debug mode

Browse source
This commit is contained in:
Frederic Bouvier 2011-01-08 15:17:49 +01:00
parent 311925ecb4
commit 39ecaf0ca8
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
CMakeModules/FindPLIB.cmake
View file

@ -34,6 +34,8 @@
# OPENAL_LIBRARY to override this selection or set the CMake environment # OPENAL_LIBRARY to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths. # CMAKE_INCLUDE_PATH to modify the search paths.
include(SelectLibraryConfigurations)
set(save_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK}) set(save_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
set(CMAKE_FIND_FRAMEWORK ONLY) set(CMAKE_FIND_FRAMEWORK ONLY)
FIND_PATH(PLIB_INCLUDE_DIR ul.h FIND_PATH(PLIB_INCLUDE_DIR ul.h
@ -82,21 +84,40 @@ macro(find_static_component comp libs)
set(compLib "plib${comp}") set(compLib "plib${comp}")
endif(MSVC) endif(MSVC)
string(TOUPPER "PLIB_${comp}_LIBRARY" compLibName) string(TOUPPER "PLIB_${comp}" compLibBase)
set( compLibName ${compLibBase}_LIBRARY )
FIND_LIBRARY(${compLibName}
NAMES ${compLib} FIND_LIBRARY(${compLibName}_DEBUG
HINTS $ENV{PLIBDIR} NAMES ${compLib}_d
HINTS $ENV{SIMGEAR_DIR}
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS PATHS
/usr/local /usr/local
/usr /usr
/opt /opt
) )
FIND_LIBRARY(${compLibName}_RELEASE
set(componentLib ${${compLibName}}) NAMES ${compLib}
if (NOT ${componentLib} STREQUAL "componentLib-NOTFOUND") HINTS $ENV{SIMGEAR_DIR}
list(APPEND ${libs} ${componentLib}) PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
/usr/local
/usr
/opt
)
select_library_configurations( ${compLibBase} )
set(componentLibRelease ${${compLibName}_RELEASE})
#message(STATUS "Simgear ${compLibName}_RELEASE ${componentLibRelease}")
set(componentLibDebug ${${compLibName}_DEBUG})
#message(STATUS "Simgear ${compLibName}_DEBUG ${componentLibDebug}")
if (NOT ${compLibName}_DEBUG)
if (NOT ${compLibName}_RELEASE)
#message(STATUS "found ${componentLib}")
list(APPEND ${libs} ${componentLibRelease})
endif()
else()
list(APPEND ${libs} optimized ${componentLibRelease} debug ${componentLibDebug})
endif() endif()
endmacro() endmacro()

6
CMakeModules/FindSimGear.cmake
View file

@ -33,7 +33,7 @@
# People will have to manually change the cache values of # People will have to manually change the cache values of
# SimGear_LIBRARIES to override this selection or set the CMake environment # SimGear_LIBRARIES to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths. # CMAKE_INCLUDE_PATH to modify the search paths.
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
FIND_PATH(SIMGEAR_INCLUDE_DIR simgear/math/SGMath.hxx FIND_PATH(SIMGEAR_INCLUDE_DIR simgear/math/SGMath.hxx
@ -89,9 +89,9 @@ macro(find_sg_component comp libs)
select_library_configurations( ${compLibBase} ) select_library_configurations( ${compLibBase} )
set(componentLibRelease ${${compLibName}_RELEASE}) set(componentLibRelease ${${compLibName}_RELEASE})
message(STATUS "Simgear ${compLibName}_RELEASE ${componentLibRelease}") #message(STATUS "Simgear ${compLibName}_RELEASE ${componentLibRelease}")
set(componentLibDebug ${${compLibName}_DEBUG}) set(componentLibDebug ${${compLibName}_DEBUG})
message(STATUS "Simgear ${compLibName}_DEBUG ${componentLibDebug}") #message(STATUS "Simgear ${compLibName}_DEBUG ${componentLibDebug}")
if (NOT ${compLibName}_DEBUG) if (NOT ${compLibName}_DEBUG)
if (NOT ${compLibName}_RELEASE) if (NOT ${compLibName}_RELEASE)
#message(STATUS "found ${componentLib}") #message(STATUS "found ${componentLib}")