Переглянути джерело

using correct cmake source dir variable

Joel Gallant 9 роки тому
батько
коміт
4ac5f6b17c
2 змінених файлів з 5 додано та 5 видалено
  1. 1 1
      CMakeLists.txt
  2. 4 4
      src/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -425,7 +425,7 @@ set(CPACK_PACKAGE_VERSION_MINOR "${CIVETWEB_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${CIVETWEB_VERSION_PATCH}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A HTTP library and server")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_PACKAGE_DEPENDS "openssl")
 if (CIVETWEB_ENABLE_LUA_SHARED)

+ 4 - 4
src/CMakeLists.txt

@@ -111,7 +111,7 @@ if (CIVETWEB_ENABLE_LUA)
     URL_MD5 ${CIVETWEB_LUA_FILESYSTEM_MD5_HASH}
     PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-      "${CMAKE_SOURCE_DIR}/cmake/luafilesystem/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/luafilesystem/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
     CMAKE_ARGS
       "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
       "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
@@ -144,7 +144,7 @@ if (CIVETWEB_ENABLE_LUA)
     URL_MD5 ${CIVETWEB_LUA_SQLITE_MD5_HASH}
     PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-      "${CMAKE_SOURCE_DIR}/cmake/luasqlite/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/luasqlite/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
     CMAKE_ARGS
       "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
       "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
@@ -174,7 +174,7 @@ if (CIVETWEB_ENABLE_LUA)
     URL_MD5 ${CIVETWEB_LUA_XML_MD5_HASH}
     PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-      "${CMAKE_SOURCE_DIR}/cmake/luaxml/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/luaxml/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
     CMAKE_ARGS
       "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
       "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
@@ -202,7 +202,7 @@ if (CIVETWEB_ENABLE_LUA)
     URL_MD5 ${CIVETWEB_SQLITE_MD5_HASH}
     PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-      "${CMAKE_SOURCE_DIR}/cmake/sqlite/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sqlite/CMakeLists.txt" <SOURCE_DIR>/CMakeLists.txt
     CMAKE_ARGS
       "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
       "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"