FIXUP of CMakeLists/RORSERVER_WITH_CURL

RigsOfRods · Dec 23, 2024 · d775e42 · d775e42
1 parent 442282d
commit d775e42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(jsoncpp REQUIRED)
 find_package(SocketW REQUIRED)
 find_package(CURL)
 cmake_dependent_option(RORSERVER_WITH_ANGELSCRIPT "Adds scripting support" ON "TARGET Angelscript::angelscript" OFF)
-cmake_dependent_option(RORSERVER_WITH_CURL "Adds curl request support via AngelScript" ON "TARGET Angelscript::angelscript CURL:libcurl" OFF)
+cmake_dependent_option(RORSERVER_WITH_CURL "Adds CURL request support (needs AngelScript)" ON "TARGET CURL:libcurl" OFF)
 
 # setup paths
 SET(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")

diff --git a/source/server/CMakeLists.txt b/source/server/CMakeLists.txt
@@ -13,10 +13,11 @@ if (RORSERVER_WITH_ANGELSCRIPT)
     target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_ANGELSCRIPT)
     target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/source/angelscript_add_on)
     target_link_libraries(${PROJECT_NAME} PRIVATE Angelscript::angelscript angelscript_addons)
-    if (RORSERVER_WITH_CURL)
-        target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_CURL)
-        target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
-    endif ()
+endif ()
+
+if (RORSERVER_WITH_CURL)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_CURL)
+    target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
 endif ()
 
 target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads SocketW::SocketW jsoncpp_lib)