Skip to content

Commit 58583da

Browse files
hananiahhsuhananiahhsu
authored
Merge pull request #16 from hananiahhsu/Development_Hananiah
【#15】 CMakeList should adapt to linux environment
2 parents ce2a0e8 + 209a4c6 commit 58583da

17 files changed

Lines changed: 346 additions & 218 deletions

File tree

‎Alice‎

Submodule Alice updated from 932a156 to 2c0fa70

‎CMakeLists.txt‎

Lines changed: 99 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ if(NOT CMAKE_BUILD_TYPE)
6363
set(CMAKE_BUILD_TYPE debug)
6464
endif()
6565

66-
set(CMAKE_EXE_LINKER_FLAGS "/machine:x64")
6766

6867
if(MSVC)
6968
add_definitions(-DUNICODE -D_UNICODE)
@@ -111,25 +110,31 @@ endif()
111110
#-----------------------------------------------------------------------------
112111
# 定义项目构建中间文件的生成目录
113112
#-----------------------------------------------------------------------------
114-
set(CMAKE_GENERATOR_PLATFORM x64)
115-
if(SOLIDRENDER_WIN)
116-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
117-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
118-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
119-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
120-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
121-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
122-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
123-
endif()
113+
# 用指针位数决定输出目录：x64 / x86
114+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
115+
set(SD_ARCH "x64")
116+
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
117+
set(SD_ARCH "x86")
118+
else()
119+
message(FATAL_ERROR "Unknown pointer size: ${CMAKE_SIZEOF_VOID_P}")
120+
endif()
124121

125-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
126-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
127-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
128-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
129-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
130-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
131-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
132-
endif()
122+
# Linux 侧需要 GNUInstallDirs 提供 CMAKE_INSTALL_LIBDIR/BINDIR
123+
if(UNIX AND NOT APPLE)
124+
include(GNUInstallDirs)
125+
endif()
126+
127+
# 防止误开关：Linux 下不允许走 SOLIDRENDER_WIN 分支
128+
if(SOLIDRENDER_WIN AND NOT WIN32)
129+
message(FATAL_ERROR "SOLIDRENDER_WIN=ON but WIN32=OFF. Disable SOLIDRENDER_WIN on Linux.")
130+
endif()
131+
if(SOLIDRENDER_WIN)
132+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
133+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
134+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
135+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
136+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
137+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
133138

134139
elseif(SOLIDRENDER_LINUX)
135140
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
@@ -237,7 +242,7 @@ endif()
237242
add_subdirectory(Alice)
238243

239244
# 外部项目(包括第三方库)
240-
add_subdirectory(externals)
245+
add_subdirectory(Externals)
241246

242247
# 单元测试
243248
add_subdirectory(UnitTest)
@@ -252,4 +257,78 @@ endif()
252257

253258

254259

260+
261+
262+
263+
#-----------------------------------------------------------------------------
264+
# Installation
265+
#-----------------------------------------------------------------------------
266+
267+
268+
# 用指针位数决定输出目录：x64 / x86
269+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
270+
set(SD_ARCH "x64")
271+
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
272+
set(SD_ARCH "x86")
273+
else()
274+
message(FATAL_ERROR "Unknown pointer size: ${CMAKE_SIZEOF_VOID_P}")
275+
endif()
276+
277+
# Linux 侧需要 GNUInstallDirs 提供 CMAKE_INSTALL_LIBDIR/BINDIR
278+
if(UNIX AND NOT APPLE)
279+
include(GNUInstallDirs)
280+
endif()
281+
282+
# 防止误开关：Linux 下不允许走 SOLIDRENDER_WIN 分支
283+
if(SOLIDRENDER_WIN AND NOT WIN32)
284+
message(FATAL_ERROR "SOLIDRENDER_WIN=ON but WIN32=OFF. Disable SOLIDRENDER_WIN on Linux.")
285+
endif()
286+
287+
# 测试target的存在性：
288+
if(TARGET AliceCommandSystem)
289+
message(STATUS "AliceCommandSystem exists in APP scope")
290+
else()
291+
message(STATUS "AliceCommandSystem NOT exists in APP scope")
292+
endif()
293+
294+
295+
# 建议：统一一个安装目的地根目录（你现在是 INSTALL_DIR/INSTALL）
296+
set(SD_INSTALL_DST "${INSTALL_DIR}/INSTALL")
297+
message("SD_INSTALL_DST = ${SD_INSTALL_DST}")
298+
# 需要安装的目标列表
299+
set(SD_INSTALL_TARGETS
300+
AliceCommandSystem
301+
AlicePropertyBrowser
302+
AliceRibbon
303+
AliceThemeSupport
304+
AliceUiBasicTools
305+
AliceUiFrameWork
306+
XRibbonBar
307+
XToolbar
308+
)
309+
310+
# 可选：提前检查 target 是否存在（更容易定位问题）
311+
foreach(_t IN LISTS SD_INSTALL_TARGETS)
312+
if(NOT TARGET ${_t})
313+
message(FATAL_ERROR "Install target not found: ${_t}")
314+
endif()
315+
endforeach()
316+
317+
# Windows：必须加 WIN32，避免 Linux/Makefiles 被污染
318+
if(WIN32 AND SOLIDRENDER_WIN)
319+
install(TARGETS ${SD_INSTALL_TARGETS}
320+
RUNTIME DESTINATION "${SD_INSTALL_DST}" # .exe / .dll
321+
ARCHIVE DESTINATION "${SD_INSTALL_DST}" # .lib（静态库或 import lib）
322+
LIBRARY DESTINATION "${SD_INSTALL_DST}" # MinGW: .dll.a；MSVC 通常为空
323+
)
324+
325+
# Linux：同样用 TARGETS，CMake 会把 .so 走到 LIBRARY
326+
elseif(UNIX AND NOT APPLE AND SOLIDRENDER_LINUX)
327+
install(TARGETS ${SD_INSTALL_TARGETS}
328+
RUNTIME DESTINATION "${SD_INSTALL_DST}" # 通常为空（除非是可执行文件）
329+
LIBRARY DESTINATION "${SD_INSTALL_DST}" # .so
330+
ARCHIVE DESTINATION "${SD_INSTALL_DST}" # .a
331+
)
332+
endif()
333+
255334
message("*--*--*--*--*--*--*--*--*--*--*--End Top Level CmakeList--*--*--*--*--*--*--*--*--*--*--*--*--*")

‎Demos/DemoDependencyPlugin/CMakeLists.txt‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,31 @@ include_directories(${PROJECT_SOURCE_DIR}/Demos/DemoDependencyPlugin/Public)
5252
# 定义项目构建中间文件的生成目录
5353
#-----------------------------------------------------------------------------
5454
message("${CMAKE_BINARY_DIR}")
55-
set(CMAKE_GENERATOR_PLATFORM x64)
55+
# 用指针位数决定输出目录：x64 / x86
56+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
57+
set(SD_ARCH "x64")
58+
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
59+
set(SD_ARCH "x86")
60+
else()
61+
message(FATAL_ERROR "Unknown pointer size: ${CMAKE_SIZEOF_VOID_P}")
62+
endif()
63+
64+
# Linux 侧需要 GNUInstallDirs 提供 CMAKE_INSTALL_LIBDIR/BINDIR
65+
if(UNIX AND NOT APPLE)
66+
include(GNUInstallDirs)
67+
endif()
68+
69+
# 防止误开关：Linux 下不允许走 SOLIDRENDER_WIN 分支
70+
if(SOLIDRENDER_WIN AND NOT WIN32)
71+
message(FATAL_ERROR "SOLIDRENDER_WIN=ON but WIN32=OFF. Disable SOLIDRENDER_WIN on Linux.")
72+
endif()
5673
if(SOLIDRENDER_WIN)
57-
message("It is configuring the dir of output")
58-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
59-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
60-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
61-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug/Plugins)
62-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
63-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
64-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release/Plugins)
65-
endif()
66-
67-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
68-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
69-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
70-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug/Plugins)
71-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
72-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
73-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release/Plugins)
74-
endif()
74+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
75+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
76+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug/Plugins)
77+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
78+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
79+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release/Plugins)
7580

7681
elseif(SOLIDRENDER_LINUX)
7782
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
@@ -93,8 +98,6 @@ set_target_properties(SolidDemoDependencyPlugin PROPERTIES FOLDER "Demos")
9398
# 根据系统及机器位数设置链接的位数
9499
# 必须放在link之后,否则设置无效
95100
#-----------------------------------------------------------------------------
96-
set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64")
97-
98101

99102
if(WIN32)
100103
# include the major version number in Windows shared library names (but not import library names)

‎Demos/DemoDependencyPlugin/Public/SolidDemoDependencyPlugin.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#pragma once
22
#include "AliceMacroDefinitions.h"
3-
3+
#if defined(_WIN32)
44
#ifdef ALICE_DEMO_DEPEND_PLUGIN_HOME
55
#define ALICE_DEMO_DEPEND_PLUGIN_EXPORT DLL_EXPORT
66
#else
77
#define ALICE_DEMO_DEPEND_PLUGIN_EXPORT DLL_IMPORT
88
#endif
9-
9+
#else
10+
#define ALICE_DEMO_DEPEND_PLUGIN_EXPORT __attribute__((visibility("default")))
11+
#endif
1012

‎Demos/DemoPlugin/CMakeLists.txt‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,31 @@ include_directories(${PROJECT_SOURCE_DIR}/Demos/DemoPlugin/Public)
5252
# 定义项目构建中间文件的生成目录
5353
#-----------------------------------------------------------------------------
5454
message("${CMAKE_BINARY_DIR}")
55-
set(CMAKE_GENERATOR_PLATFORM x64)
55+
# 用指针位数决定输出目录：x64 / x86
56+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
57+
set(SD_ARCH "x64")
58+
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
59+
set(SD_ARCH "x86")
60+
else()
61+
message(FATAL_ERROR "Unknown pointer size: ${CMAKE_SIZEOF_VOID_P}")
62+
endif()
63+
64+
# Linux 侧需要 GNUInstallDirs 提供 CMAKE_INSTALL_LIBDIR/BINDIR
65+
if(UNIX AND NOT APPLE)
66+
include(GNUInstallDirs)
67+
endif()
68+
69+
# 防止误开关：Linux 下不允许走 SOLIDRENDER_WIN 分支
70+
if(SOLIDRENDER_WIN AND NOT WIN32)
71+
message(FATAL_ERROR "SOLIDRENDER_WIN=ON but WIN32=OFF. Disable SOLIDRENDER_WIN on Linux.")
72+
endif()
5673
if(SOLIDRENDER_WIN)
57-
message("It is configuring the dir of output")
58-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
59-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
60-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug)
61-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x64/Debug/Plugins)
62-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
63-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release)
64-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x64/Release/Plugins)
65-
endif()
66-
67-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
68-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
69-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug)
70-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/x86/Debug/Plugins)
71-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
72-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release)
73-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/x86/Release/Plugins)
74-
endif()
74+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
75+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug)
76+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/${SD_ARCH}/Debug/Plugins)
77+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
78+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release)
79+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${SD_ARCH}/Release/Plugins)
7580

7681
elseif(SOLIDRENDER_LINUX)
7782
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
@@ -93,8 +98,6 @@ set_target_properties(SolidDemoPlugin PROPERTIES FOLDER "Demos")
9398
# 根据系统及机器位数设置链接的位数
9499
# 必须放在link之后,否则设置无效
95100
#-----------------------------------------------------------------------------
96-
set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64")
97-
98101

99102
if(WIN32)
100103
# include the major version number in Windows shared library names (but not import library names)

‎Demos/DemoPlugin/Public/SolidDemoPlugin.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#pragma once
22
#include "AliceMacroDefinitions.h"
3-
3+
#if defined(_WIN32)
44
#ifdef ALICE_DEMO_PLUGIN_HOME
55
#define ALICE_DEMO_PLUGIN_EXPORT DLL_EXPORT
66
#else
77
#define ALICE_DEMO_PLUGIN_EXPORT DLL_IMPORT
88
#endif
9-
9+
#else
10+
#define ALICE_DEMO_PLUGIN_EXPORT __attribute__((visibility("default")))
11+
#endif
1012

‎Designer/APP/CMakeLists.txt‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,6 @@ message("CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
112112
link_directories(${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE})
113113

114114

115-
#-----------------------------------------------------------------------------
116-
# 库文件链接路径<add_executable之前>
117-
# link_libraries 不会为每个目标生成链接路径。而是直接添加库的名称。
118-
#-----------------------------------------------------------------------------
119-
message("PROJECT_NAME = ${PROJECT_NAME}")
120-
link_libraries(glu32.lib)
121-
link_libraries(glew32.lib)
122-
link_libraries(opengl32.lib)
123-
link_libraries(freeimage.lib)
124-
link_libraries(log4cplusU.lib)
125-
link_libraries(AliceCoreApplicationInterface.lib)
126-
link_libraries(AliceUiFrameWork.lib)
127-
link_libraries(AliceBasicTool.lib)
128-
link_libraries(AliceComponentSystem.lib)
129-
link_libraries(AliceLaunchInterface.lib)
130115
#-----------------------------------------------------------------------------
131116
# QRC文件打包及前处理命令
132117
#-----------------------------------------------------------------------------
@@ -139,10 +124,6 @@ set(SD_RCC_FILE "${SD_RCC_DIR}/SolidDesignerRes.rcc")
139124
file(GLOB_RECURSE SD_QRCS "${GEN_RCC_WD}/*.qrc")
140125

141126

142-
143-
144-
145-
146127
#-----------------------------------------------------------------------------
147128
# 添加可执行程序目标
148129
#-----------------------------------------------------------------------------
@@ -199,23 +180,45 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/source/resource/data" DESTINATION "${INST
199180

200181
install(DIRECTORY "${CMAKE_SOURCE_DIR}/source/resource/Script" DESTINATION "${INSTALL_DIR}/INSTALL")
201182

202-
set(CMAKE_GENERATOR_PLATFORM x64)
203-
if(SOLIDRENDER_WIN)
204-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
205-
#install(DIRECTORY "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}" DESTINATION "${INSTALL_DIR}/INSTALL" FILES_MATCHING PATTERN "*.dll" PATTERN "${CMAKE_BUILD_TYPE}" EXCLUDE)
206-
install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/CommandSystem.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
207-
install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/AlicePropertyBrowser.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
208-
install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XFrameWork.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
209-
install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XRibbonBar.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
210-
install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XToolbar.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
211-
endif()
212-
213-
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
214-
install(DIRECTORY "${CMAKE_BINARY_DIR}/x86/${CMAKE_BUILD_TYPE}" DESTINATION "${INSTALL_DIR}/INSTALL")
215-
endif()
216-
217-
elseif(SOLIDRENDER_LINUX)
218-
install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" DESTINATION "${INSTALL_DIR}/INSTALL")
219-
endif()
183+
184+
185+
# if(SOLIDRENDER_WIN)
186+
# if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
187+
# #install(DIRECTORY "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}" DESTINATION "${INSTALL_DIR}/INSTALL" FILES_MATCHING PATTERN "*.dll" PATTERN "${CMAKE_BUILD_TYPE}" EXCLUDE)
188+
# install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/CommandSystem.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
189+
# install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/AlicePropertyBrowser.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
190+
# install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XFrameWork.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
191+
# install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XRibbonBar.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
192+
# install(FILES "${CMAKE_BINARY_DIR}/x64/${CMAKE_BUILD_TYPE}/XToolbar.dll" DESTINATION "${INSTALL_DIR}/INSTALL" )
193+
# endif()
194+
195+
# if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
196+
# install(DIRECTORY "${CMAKE_BINARY_DIR}/x86/${CMAKE_BUILD_TYPE}" DESTINATION "${INSTALL_DIR}/INSTALL")
197+
# endif()
198+
199+
# elseif(SOLIDRENDER_LINUX)
200+
# install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" DESTINATION "${INSTALL_DIR}/INSTALL")
201+
# endif()
202+
203+
204+
#-----------------------------------------------------------------------------
205+
# 链接第三方的库
206+
# @1、链接的动作需要放到add_library之后
207+
#-----------------------------------------------------------------------------
208+
message("PROJECT_NAME = ${PROJECT_NAME}")
209+
target_link_libraries(${PROJECT_NAME}
210+
glu32
211+
glew32
212+
opengl32
213+
freeimage
214+
log4cplusU
215+
AliceCoreApplicationInterface
216+
AliceUiFrameWork
217+
AliceBasicTool
218+
AliceComponentSystem
219+
AliceLaunchInterface
220+
)
221+
222+
220223

221224
message(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>End Designer APP<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")

0 commit comments

Comments
 (0)