pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-04 21:54:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up CMake files (#3417)

Browse Source 
* Clean up CMake files

* bump CMake minimum required version to 3.7 to utilize
  [`VERSION_GREATER_EQUAL`](https://cmake.org/cmake/help/v3.7/release/3.7.html#index-0-command:if)
* improve catch-dependency
* fix conditionals
* use early return
* properly use CMake commands

* Apply suggestions from code review

Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
This commit is contained in:
Eisuke Kawashima
2020-11-28 16:00:39 +09:00
committed by GitHub
parent 22a49fc760
commit e0b665bfe1
13 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Code/JavaWrappers/csharp_wrapper/CMakeLists.txt
View File

@@ -16,7 +16,7 @@ SET_SOURCE_FILES_PROPERTIES(GraphMolCSharp.i PROPERTIES CPLUSPLUS ON )
# Setup a few variables for environment-specific things
if(WIN32)
ADD_DEFINITIONS("/W3 /wd4716 /bigobj")
ADD_COMPILE_OPTIONS(/W3 /wd4716 /bigobj)
SET(PATH_SEP ";")
SET(COPY_CMD xcopy ${COPY_SOURCE} ${COPY_DEST} /Y /I)
else()
@@ -29,7 +29,7 @@ if(APPLE)
SET(CMAKE_SIZEOF_VOID_P 4)
endif(APPLE)
if(CMAKE_SIZEOF_VOID_P MATCHES 4)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
SET(CMAKE_SWIG_FLAGS -namespace "GraphMolWrap")
else()
if (WIN32)

4
Code/JavaWrappers/gmwrapper/CMakeLists.txt
View File

@@ -54,7 +54,7 @@ FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/org/RDKit COPY_DEST)
# Setup a few variables for environment-specific things
if(WIN32)
ADD_DEFINITIONS("/W3 /wd4716 /wd4101 /bigobj")
ADD_COMPILE_OPTIONS(/W3 /wd4716 /wd4101 /bigobj)
SET(PATH_SEP ";")
SET(COPY_CMD xcopy ${COPY_SOURCE} ${COPY_DEST} /Y /I)
else()
@@ -67,7 +67,7 @@ if(APPLE)
SET(CMAKE_SIZEOF_VOID_P 4)
endif(APPLE)
if(CMAKE_SIZEOF_VOID_P MATCHES 4)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
SET(CMAKE_SWIG_FLAGS -package "org.RDKit")
else()
if (WIN32)