From 939ca1f1ddbe9813e2ba9f73e98eaaef4068d6b9 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 22 Mar 2016 16:52:49 +0000 Subject: [PATCH] Rename the "loot" API target to "loot_api" On case-insensitive systems (eg. Windows), the LOOT application and the loot API targets were conflicting, allowing only one to be built. --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7f338b1..d94e2d44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,14 +359,14 @@ ENDIF () ############################## # Build API. -add_library (loot ${LOOT_API_SRC} ${LOOT_API_HEADERS}) -add_dependencies (loot libespm libgit2 libloadorder pseudosem yaml-cpp) -target_link_libraries (loot ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LOOT_LIBS} ${LIBLOADORDER_LIBRARIES}) +add_library (loot_api ${LOOT_API_SRC} ${LOOT_API_HEADERS}) +add_dependencies (loot_api libespm libgit2 libloadorder pseudosem yaml-cpp) +target_link_libraries (loot_api ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LOOT_LIBS} ${LIBLOADORDER_LIBRARIES}) # Build tests. add_executable(tests ${LOOT_TESTS_SRC} ${LOOT_TESTS_HEADERS}) -add_dependencies(tests loot GTest testing-metadata testing-plugins) -target_link_libraries(tests loot ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} ${LOOT_LIBS} ${GTEST_LIBRARIES}) +add_dependencies(tests loot_api GTest testing-metadata testing-plugins) +target_link_libraries(tests loot_api ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} ${LOOT_LIBS} ${GTEST_LIBRARIES}) # Build application. add_executable (LOOT ${LOOT_GUI_SRC} ${LOOT_GUI_HEADERS}) @@ -396,9 +396,9 @@ ENDIF () IF (CMAKE_SYSTEM_NAME MATCHES "Windows") IF (BUILD_SHARED_LIBS) - set_target_properties (loot PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS} LOOT_EXPORT") + set_target_properties (loot_api PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS} LOOT_EXPORT") ELSE () - set_target_properties (loot PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS} LOOT_STATIC") + set_target_properties (loot_api PROPERTIES COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS} LOOT_STATIC") ENDIF () ENDIF ()