Changeset: 5a7061a04ce4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a7061a04ce4
Modified Files:
CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/odbc/driver/CMakeLists.txt
gdk/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
Branch: cmake-fun
Log Message:
No need to check for Windows platform for .rc files, it just works.
diffs (60 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0) # The $<TARGET_PDB_FILE:tgt> generator
expression appears only on cmake 3.1, which causes problems on Windows with
cmake 3.0
# Change these variables between releases
set(MONETDB_VERSION_MAJOR "11")
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -13,7 +13,7 @@ if(WIN32)
list(APPEND MAPI_LINK_LIBRARIES stream ${SOCKET_LIBRARIES}
${CRYPTO_LIBRARIES})
endif()
-add_library(mapi SHARED mapi.c $<$<PLATFORM_ID:Windows>:mapi.rc>)
+add_library(mapi SHARED mapi.c mapi.rc)
target_link_libraries(mapi PRIVATE ${MAPI_LINK_LIBRARIES})
set_target_properties(mapi PROPERTIES VERSION ${MAPI_VERSION} SOVERSION
${MAPI_VERSION_MAJOR})
target_compile_definitions(mapi PRIVATE LIBMAPI)
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -99,7 +99,7 @@ add_library(MonetODBC MODULE
SQLStatistics.c
SQLTablePrivileges.c
SQLTables.c
- SQLTransact.c $<$<PLATFORM_ID:Windows>:driver.rc>
$<$<PLATFORM_ID:Windows>:ODBC.syms>)
+ SQLTransact.c driver.rc ODBC.syms)
target_link_libraries(MonetODBC PRIVATE mapi stream ${ICONV_LIBRARIES}
${ODBCINST_LIBRARIES} ${CRYPTO_LIBRARIES}
${SOCKET_LIBRARIES})
target_compile_definitions(MonetODBC PRIVATE LIBMONETODBC)
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(gdk SHARED
gdk_interprocess.c gdk_interprocess.h
gdk_firstn.c
gdk_analytic_bounds.c
- gdk_analytic_func.c gdk_analytic.h
$<$<PLATFORM_ID:Windows>:libbat.rc>)
+ gdk_analytic_func.c gdk_analytic.h libbat.rc)
target_link_libraries(gdk PRIVATE ${GDK_LINK_LIBRARIES})
set_target_properties(gdk PROPERTIES VERSION ${GDK_VERSION} SOVERSION
${GDK_VERSION_MAJOR} OUTPUT_NAME bat)
target_compile_definitions(gdk PRIVATE LIBGDK)
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -15,7 +15,7 @@ if(WIN32)
endif()
endif()
-add_library(monetdb5 SHARED ${MONETDB5_OBJECTS}
$<$<PLATFORM_ID:Windows>:libmonetdb5.rc>)
+add_library(monetdb5 SHARED ${MONETDB5_OBJECTS} libmonetdb5.rc)
target_link_libraries(monetdb5 PUBLIC mutils mcrypt msabaoth PRIVATE
${MONETDB5_PRIVATE_LINK_LIBRARIES})
set_target_properties(monetdb5 PROPERTIES VERSION ${MONETDB5_VERSION}
SOVERSION ${MONETDB5_VERSION_MAJOR})
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
