diff --git a/src/tzdb/list_directory.cmake b/CMakeModules/list_directory.cmake similarity index 67% rename from src/tzdb/list_directory.cmake rename to CMakeModules/list_directory.cmake index a2c6c78..9f4648e 100644 --- a/src/tzdb/list_directory.cmake +++ b/CMakeModules/list_directory.cmake @@ -6,5 +6,5 @@ if (RECURSE) set(HOW_TO_GLOB "GLOB_RECURSE") endif() -file(GLOB FILE_LIST LIST_DIRECTORIES ${WITH_DIRECTORIES} RELATIVE ${CMAKE_SOURCE_DIR} "*") +file(${HOW_TO_GLOB} FILE_LIST LIST_DIRECTORIES ${WITH_DIRECTORIES} RELATIVE ${CMAKE_SOURCE_DIR} "*") execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${FILE_LIST};") \ No newline at end of file diff --git a/externals/tz/CMakeLists.txt b/externals/tz/CMakeLists.txt index 38e6525..d0a9589 100644 --- a/externals/tz/CMakeLists.txt +++ b/externals/tz/CMakeLists.txt @@ -28,7 +28,7 @@ if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}") execute_process( COMMAND - ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_SOURCE_DIR}/list_directory.cmake" + ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/CMakeModules/list_directory.cmake false ON WORKING_DIRECTORY "${TZ_ZONEINFO_DIR}" OUTPUT_VARIABLE diff --git a/externals/tz/list_directory.cmake b/externals/tz/list_directory.cmake deleted file mode 100644 index 858de59..0000000 --- a/externals/tz/list_directory.cmake +++ /dev/null @@ -1,2 +0,0 @@ -file(GLOB_RECURSE FILE_LIST LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "*") -execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${FILE_LIST};") \ No newline at end of file diff --git a/src/tzdb/CMakeLists.txt b/src/tzdb/CMakeLists.txt index f8e01ee..119002b 100644 --- a/src/tzdb/CMakeLists.txt +++ b/src/tzdb/CMakeLists.txt @@ -46,18 +46,11 @@ add_custom_target(x80e ${NX_VERSION_FILE}) set(BINARY_LIST_TXT ${NX_TZDB_DIR}/binaryList.txt) -# add_custom_command( -# OUTPUT -# ${BINARY_LIST_TXT} -# COMMAND -# sh ${CMAKE_CURRENT_SOURCE_DIR}/generate_binary_list_txt.sh ${BINARY_LIST_TXT} -# WORKING_DIRECTORY -# ${NX_ZONEINFO_DIR}) add_custom_command( OUTPUT ${BINARY_LIST_TXT} COMMAND - ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/generate_binary_list_txt.cmake ${BINARY_LIST_TXT} ${CMAKE_CURRENT_SOURCE_DIR}/list_directory.cmake + ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/generate_binary_list_txt.cmake ${BINARY_LIST_TXT} ${PROJECT_SOURCE_DIR}/CMakeModules/list_directory.cmake WORKING_DIRECTORY ${NX_ZONEINFO_DIR})