BUG: Fixed building of C++-only projects and added a test.
This commit is contained in:
parent
673e3f8964
commit
d56e6a9241
|
@ -42,6 +42,16 @@ IF(NOT CMAKE_CXX_COMPILER)
|
|||
ENDIF(NOT CMAKE_CXX_COMPILER)
|
||||
MARK_AS_ADVANCED(CMAKE_CXX_COMPILER)
|
||||
|
||||
GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_CXX_COMPILER}" PATH)
|
||||
|
||||
FIND_PROGRAM(CMAKE_AR NAMES ar PATHS ${COMPILER_LOCATION})
|
||||
|
||||
FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib)
|
||||
IF(NOT CMAKE_RANLIB)
|
||||
SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
|
||||
ENDIF(NOT CMAKE_RANLIB)
|
||||
MARK_AS_ADVANCED(CMAKE_RANLIB)
|
||||
|
||||
# do not test for GNU if the generator is visual studio
|
||||
IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
|
||||
SET(CMAKE_COMPILER_IS_GNUCXX_RUN 1)
|
||||
|
|
|
@ -504,6 +504,16 @@ IF(BUILD_TESTING)
|
|||
--build-two-config
|
||||
--test-command conly)
|
||||
|
||||
ADD_TEST(CxxOnly ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/CxxOnly"
|
||||
"${CMake_BINARY_DIR}/Tests/CxxOnly"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project cxxonly
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-two-config
|
||||
--test-command cxxonly)
|
||||
|
||||
ADD_TEST(MacroTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/MacroTest"
|
||||
|
|
Loading…
Reference in New Issue