summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2017-05-23 18:25:20 -0400
committerAllen Winter <allen.winter@kdab.com>2017-05-23 18:25:20 -0400
commitd89668a894993dec35b4a655cfcc61784d83f8f7 (patch)
treed9ac9489d754daf54a00cfd4af054d66103a9415
parent878f1ea29a9d8999979c9acbf3f6a6b2f7132974 (diff)
downloadlibical-git-d89668a894993dec35b4a655cfcc61784d83f8f7.tar.gz
src/libicalss/CMakeLists.txt - fix the custom_target for the combined icalss header
ISSUE#296
-rw-r--r--src/libicalss/CMakeLists.txt23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/libicalss/CMakeLists.txt b/src/libicalss/CMakeLists.txt
index da7e4da7..bba042b4 100644
--- a/src/libicalss/CMakeLists.txt
+++ b/src/libicalss/CMakeLists.txt
@@ -21,15 +21,7 @@ endif()
add_custom_target(
icalss-header ALL
- COMMAND
- ${CMAKE_COMMAND}
- -DTOPS:FILEPATH=${TOPS}
- -DTOPB:FILEPATH=${TOPB}
- -DICAL_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/src/libicalss/icalss.h
- -DBDB_FOUND=${BDB_FOUND}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/icalss_file.cmake
- DEPENDS
- ical-header
+ DEPENDS ${CMAKE_BINARY_DIR}/src/libicalss/icalss.h
)
########### next target ###############
@@ -72,6 +64,19 @@ if(BDB_FOUND)
)
endif()
+add_custom_command(
+ OUTPUT
+ ${CMAKE_BINARY_DIR}/src/libicalss/icalss.h
+ COMMAND
+ ${CMAKE_COMMAND}
+ -DTOPS:FILEPATH=${TOPS}
+ -DTOPB:FILEPATH=${TOPB}
+ -DICAL_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/src/libicalss/icalss.h
+ -DBDB_FOUND=${BDB_FOUND}
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/icalss_file.cmake
+ DEPENDS ${icalss_LIB_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/icalss_file.cmake
+)
+
add_library(icalss ${LIBRARY_TYPE} ${icalss_LIB_SRCS})
add_dependencies(icalss icalss-header)
if(NOT SHARED_ONLY)