blob: 5fd78614de4be1537786d1d3dd0c26b175e7cbd1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- CMakeLists.txt.orig 2021-12-08 05:59:54 UTC
+++ CMakeLists.txt
@@ -78,13 +78,13 @@ function(mgl_add_lib mgl_tmp_lib)
set(mgl_src_lst ${ARGV})
list(REMOVE_AT mgl_src_lst 0)
add_library(${mgllib} SHARED ${mgl_src_lst})
- add_library(${mgllib}-static STATIC ${mgl_src_lst})
+ #add_library(${mgllib}-static STATIC ${mgl_src_lst})
set_target_properties(${mgllib} PROPERTIES SOVERSION ${MathGL_SOVERSION})
set_target_properties(${mgllib} PROPERTIES DEFINE_SYMBOL "mgl_EXPORTS")
set_target_properties(${mgllib} PROPERTIES C_VISIBILITY_PRESET hidden)
set_target_properties(${mgllib} PROPERTIES CXX_VISIBILITY_PRESET hidden)
set_target_properties(${mgllib} PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
- target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE)
+ #target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE)
if(MSVC)
set(mgl_lib_static "-static")
set (CMAKE_DEBUG_POSTFIX "d")
@@ -98,18 +98,18 @@ function(mgl_add_lib mgl_tmp_lib)
elseif(MSVC)
set(mgl_lib_static)
set_target_properties(${mgllib} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ #set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
endif(MSVC)
if(enable-mgl2)
set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_end}")
- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}")
+ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}")
else(enable-mgl2)
set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_end}")
- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}")
+ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}")
endif(enable-mgl2)
install(
- TARGETS ${mgllib} ${mgllib}-static
+ TARGETS ${mgllib}
EXPORT MathGLTargets
RUNTIME DESTINATION ${MathGL_INSTALL_BIN_DIR}
ARCHIVE DESTINATION ${MathGL_INSTALL_LIB_DIR}
@@ -808,7 +808,7 @@ if(NOT enable-lgpl)
add_subdirectory( lang )
endif(enable-python OR enable-lua OR enable-octave)
add_subdirectory( utils )
-add_subdirectory( examples )
+#add_subdirectory( examples )
if(NOT WIN32)
add_subdirectory( fonts )
endif(NOT WIN32)
|
