chiark
/
gitweb
/
~ianmdlvl
/
nlopt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
edcffb7
)
Update CMakeLists.txt
author
Julien Schueller
<schueller@phimeca.com>
Thu, 6 Dec 2018 11:34:18 +0000
(12:34 +0100)
committer
GitHub
<noreply@github.com>
Thu, 6 Dec 2018 11:34:18 +0000
(12:34 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index feeb9553ea72554450db35dd1587729f9c2006b3..321f2a4ed66e75d779cbc1849d18aafc0355b8ab 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-263,8
+263,8
@@
get_target_property (NLOPT_PRIVATE_INCLUDE_DIRS ${nlopt_lib} INCLUDE_DIRECTORIES
target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src/api>" "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
if (BUILD_SHARED_LIBS)
target_include_directories (${nlopt_lib} INTERFACE "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src/api>" "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
if (BUILD_SHARED_LIBS)
- target_compile_definitions (${nlopt_lib} PUBLIC
-D
NLOPT_DLL)
- target_compile_definitions (${nlopt_lib} PRIVATE
-D
NLOPT_DLL_EXPORT)
+ target_compile_definitions (${nlopt_lib} PUBLIC NLOPT_DLL)
+ target_compile_definitions (${nlopt_lib} PRIVATE NLOPT_DLL_EXPORT)
endif ()
# pass -fPIC in case swig module is built with static library
endif ()
# pass -fPIC in case swig module is built with static library