Browse Source

Update CMakeLists

Tindy X 4 years ago
parent
commit
a4988804d4
1 changed files with 18 additions and 18 deletions
  1. 18 18
      CMakeLists.txt

+ 18 - 18
CMakeLists.txt

@@ -66,52 +66,52 @@ ADD_EXECUTABLE(${BUILD_TARGET_NAME}
     src/utils/string.cpp
     src/utils/system.cpp
     src/utils/urlencode.cpp)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} src)
-LINK_DIRECTORIES(${CMAKE_SOURCE_DIR})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE src)
+TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR})
 
 FIND_PACKAGE(PkgConfig REQUIRED)
 
 SET(THREADS_PREFER_PTHREAD_FLAG ON)
 FIND_PACKAGE(Threads REQUIRED)
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME}  ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
 
 PKG_CHECK_MODULES(LIBEVENT libevent>=2.1.10 REQUIRED)
 FIND_PATH(LIBEVENT_INCLUDE_DIR NAMES event.h PATHS ${LIBEVENT_INCLUDE_DIRS})
 FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event PATHS ${LIBEVENT_LIBRARY_DIRS})
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} ${LIBEVENT_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${LIBEVENT_INCLUDE_DIR})
+TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBEVENT_LIBRARY_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBEVENT_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${LIBEVENT_LIBRARY})
 
 FIND_PACKAGE(CURL 7.54.0 REQUIRED)
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} ${CURL_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${CURL_INCLUDE_DIRS})
+TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CURL_LIBRARY_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} CURL::libcurl)
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} -DCURL_STATICLIB)
+TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DCURL_STATICLIB)
 
 FIND_PACKAGE(Rapidjson REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${RAPIDJSON_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
 
 FIND_PACKAGE(toml11 REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${TOML11_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${TOML11_INCLUDE_DIRS})
 
 PKG_CHECK_MODULES(YAML_CPP yaml-cpp>=0.6.3 REQUIRED)
 FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} ${YAML_CPP_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${YAML_CPP_INCLUDE_DIRS})
+TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_LIBRARY_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${YAML_CPP_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} -DYAML_CPP_STATIC_DEFINE)
+TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DYAML_CPP_STATIC_DEFINE)
 
 FIND_PACKAGE(PCRE2 REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${PCRE2_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${PCRE2_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${PCRE2_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} -DPCRE2_STATIC)
+TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DPCRE2_STATIC)
 
 FIND_PACKAGE(QuickJS REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${QUICKJS_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${QUICKJS_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${QUICKJS_LIBRARIES})
 
 FIND_PACKAGE(LibCron REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} ${LIBCRON_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBCRON_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${LIBCRON_LIBRARIES})
 
 IF(WIN32)
@@ -138,7 +138,7 @@ ADD_LIBRARY(${BUILD_TARGET_NAME} STATIC
     src/utils/regexp.cpp
     src/utils/string.cpp
     src/utils/urlencode.cpp)
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DNO_JS_RUNTIME)
+TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DNO_JS_RUNTIME -DNO_WEBGET)
 
 TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PUBLIC src)