From 2c61d88b52d0231bcab4c84001c2715630753ea5 Mon Sep 17 00:00:00 2001 From: Simon Vidanovic Date: Tue, 29 Oct 2024 12:16:13 -0700 Subject: [PATCH] FileParse_Branch flag moved to the top CMakeLists.txt --- CMakeLists.txt | 5 ++++- src/CMakeLists.txt | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d788519..fcae975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,4 +69,7 @@ if(BUILD_BSDFXMLParser_Tests) # Add the test with the specified arguments add_test(NAME BSDFXMLParser-test COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BSDFXMLParser-test --gtest_catch_exceptions=0) -endif() \ No newline at end of file +endif() + +# Setting variable for parent projects so it can be checked if same version is used +set_property(TARGET ${LIB_NAME} PROPERTY FileParse_Branch ${FileParse_Branch}) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index effb2c2..6c06ade 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,9 +11,6 @@ add_library( ${LIB_NAME} target_link_libraries(${LIB_NAME} PRIVATE FileParse) -# Setting variable for parent projects so it can be checked if same version is used -set_property(TARGET ${LIB_NAME} PROPERTY FileParse_Branch ${FileParse_Branch}) - if(NOT "${fPIC}") set(fPIC ON) endif()