Commit 6a1a1b63 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

BUG: fix for bug 4772, enable_language should now work on linux with correct flags

parent 4c17c9b8
...@@ -32,10 +32,20 @@ ENDIF(CMAKE_SYSTEM_PROCESSOR) ...@@ -32,10 +32,20 @@ ENDIF(CMAKE_SYSTEM_PROCESSOR)
# load the system- and compiler specific files # load the system- and compiler specific files
IF(CMAKE_C_COMPILER_ID) IF(CMAKE_C_COMPILER_ID)
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C
OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF(CMAKE_C_COMPILER_ID) ENDIF(CMAKE_C_COMPILER_ID)
IF (NOT _INCLUDED_FILE) IF (NOT _INCLUDED_FILE)
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}
OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF (NOT _INCLUDED_FILE)
# some systems include the compiler information in the system file
# and if this is the enable_language command then it may not have been
# included at this point, or needs to be included again so that the
# language_INIT variables are set correctly
IF (NOT _INCLUDED_FILE)
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}
OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF (NOT _INCLUDED_FILE) ENDIF (NOT _INCLUDED_FILE)
......
...@@ -59,3 +59,5 @@ INCLUDE(Platform/UnixPaths) ...@@ -59,3 +59,5 @@ INCLUDE(Platform/UnixPaths)
IF(EXISTS "/etc/debian_version") IF(EXISTS "/etc/debian_version")
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
ENDIF(EXISTS "/etc/debian_version") ENDIF(EXISTS "/etc/debian_version")
# always include the gcc compiler information
INCLUDE(Platform/gcc)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment