From b459ec8ee29a175d72fa67360810ebf4cd89efd9 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 9 Jan 2020 17:20:18 +0100 Subject: [PATCH] Ensure proper compilation on Windows --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66ccd9e..4871751 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,12 +65,9 @@ if (SCRIPT_PROVIDER STREQUAL "angelscript") file(GLOB_RECURSE ANGELSCRIPT_SRC_FILES "src/AngelScript/*.cpp" "src/AngelScript/*.hpp") add_library(pkmnLib-angelscript SHARED ${ANGELSCRIPT_SRC_FILES}) SET(SCRIPT_PROVIDER_LIB_NAME "pkmnLib-angelscript") - - target_link_libraries(pkmnLib-angelscript PUBLIC ${_LINKS} angelscript) + SET(_LINKS ${_LINKS} angelscript) endif() - - if (WINDOWS) message(STATUS "Using Windows build.") set(CMAKE_CXX_FLAGS "-L ${CMAKE_BINARY_DIR}/bin") @@ -83,6 +80,10 @@ endif (WINDOWS) target_link_libraries(pkmnLib PUBLIC ${_LINKS}) +if (SCRIPT_PROVIDER STREQUAL "angelscript") + target_link_libraries(pkmnLib-angelscript PUBLIC ${_LINKS}) +endif() + if (NOT DEFINED CONAN_EXPORTED) # Create Test executable file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")