Browse Source

Make sure that we're using the right libcurl!

Jay Sistar 10 years ago
parent
commit
1f1868cdf8
2 changed files with 5 additions and 9 deletions
  1. 1 1
      Source/AtomicTool/CMakeLists.txt
  2. 4 8
      Source/ToolCore/CMakeLists.txt

+ 1 - 1
Source/AtomicTool/CMakeLists.txt

@@ -18,7 +18,7 @@ if (MSVC)
     ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"$<TARGET_FILE_DIR:AtomicTool>/D3DCompiler_47.dll\")
 
 else()
-    target_link_libraries(AtomicTool curl)
+    target_link_libraries(AtomicTool libcurl)
 endif()
 
 add_custom_command( TARGET AtomicTool POST_BUILD

+ 4 - 8
Source/ToolCore/CMakeLists.txt

@@ -1,14 +1,10 @@
 include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
                      ${CMAKE_SOURCE_DIR}/Source/ThirdParty
                      ${CMAKE_SOURCE_DIR}/Source/ThirdParty/Assimp/include
-                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/nativefiledialog)
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/nativefiledialog
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
 
-add_definitions(-DCPLUSPLUS_WITHOUT_QT)
-
-if (MSVC)
-    include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
-    add_definitions(-DCURL_STATICLIB)
-endif()
+add_definitions(-DCPLUSPLUS_WITHOUT_QT -DCURL_STATICLIB)
 
 file (GLOB_RECURSE SOURCE_FILES *.cpp *.h)
 
@@ -19,7 +15,7 @@ endif()
 
 add_library(ToolCore ${SOURCE_FILES})
 
-target_link_libraries(ToolCore Assimp Poco)
+target_link_libraries(ToolCore Assimp Poco libcurl)
 
 if (LINUX)
     target_link_libraries(ToolCore NETCore NETScript)