From 67b12efec7b5178493e7e885e976bdc4d4748c39 Mon Sep 17 00:00:00 2001 From: Tamas Kenez Date: Sun, 12 Jul 2015 23:11:53 +0200 Subject: [PATCH] build: cmake-testbuild to work on OS X and with CMake < 3.0 --- build/cmake/testbuild/CMakeLists.txt | 4 ++-- cmake-testbuild.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/cmake/testbuild/CMakeLists.txt b/build/cmake/testbuild/CMakeLists.txt index 1bb69b4..275e24d 100644 --- a/build/cmake/testbuild/CMakeLists.txt +++ b/build/cmake/testbuild/CMakeLists.txt @@ -10,9 +10,9 @@ target_link_libraries(cmake-test PRIVATE GLEW::GLEW ${OPENGL_LIBRARIES}) target_include_directories(cmake-test PRIVATE ${OPENGL_INCLUDE_DIR}) if(CMAKE_VERSION VERSION_LESS 3.0) - set(cgex $) -else() set(cgex $) +else() + set(cgex $) endif() target_compile_definitions(cmake-test PRIVATE diff --git a/cmake-testbuild.sh b/cmake-testbuild.sh index eceae8d..0dbbfd2 100755 --- a/cmake-testbuild.sh +++ b/cmake-testbuild.sh @@ -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 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