Merge pull request #53 from tamaskenez/master

build: cmake-testbuild to work on OS X and with CMake < 3.0
This commit is contained in:
Nigel Stewart 2015-08-05 10:26:52 +10:00
commit 5ae027a8cd
2 changed files with 3 additions and 2 deletions

View File

@ -10,9 +10,9 @@ target_link_libraries(cmake-test PRIVATE GLEW::GLEW ${OPENGL_LIBRARIES})
target_include_directories(cmake-test PRIVATE ${OPENGL_INCLUDE_DIR}) target_include_directories(cmake-test PRIVATE ${OPENGL_INCLUDE_DIR})
if(CMAKE_VERSION VERSION_LESS 3.0) if(CMAKE_VERSION VERSION_LESS 3.0)
set(cgex $<CONFIG>)
else()
set(cgex $<CONFIGURATION>) set(cgex $<CONFIGURATION>)
else()
set(cgex $<CONFIG>)
endif() endif()
target_compile_definitions(cmake-test PRIVATE target_compile_definitions(cmake-test PRIVATE

View File

@ -65,6 +65,7 @@ cmake out/build/cmake-testbuild -DCMAKE_BUILD_TYPE=Release
cmake --build out/build/cmake-testbuild --target install --config Release --clean-first cmake --build out/build/cmake-testbuild --target install --config Release --clean-first
export LD_LIBRARY_PATH=${PWD}/out/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${PWD}/out/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${PWD}/out/lib:$DYLD_LIBRARY_PATH
out/bin/cmake-test_d out/bin/cmake-test_d
out/bin/cmake-test out/bin/cmake-test