Skip to content

Commit ffdc2e1

Browse files
iwwugfxbot
authored andcommitted
Enable IGAExe in the build
iga{64,32} is installed in /usr/local/bin Change-Id: I245f6163d89b3fc05da06594de36e9fd6fa1262a
1 parent 68c609e commit ffdc2e1

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

visa/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ message("-- - GED_BRANCH: ${GED_BRANCH}")
5252
message("-- - CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
5353
add_subdirectory(iga/GEDLibrary/${GED_BRANCH})
5454
add_subdirectory(iga/IGALibrary)
55-
if(MEDIA_IGA AND MSVC)
55+
if(WIN32 OR UNIX)
5656
add_subdirectory(iga/IGAExe)
57-
endif(MEDIA_IGA AND MSVC)
57+
endif(WIN32 OR UNIX)
5858

5959
if(WIN32)
6060
cmake_minimum_required(VERSION 3.1)

visa/iga/IGAExe/CMakeLists.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ source_group("SourceFiles" FILES ${IGA_EXE_CPP})
2727

2828
set(IGA_EXE_DEFINITIONS _CONSOLE _LIB ${GED_BRANCH})
2929

30+
if(MSVC)
31+
add_compile_options(/EHsc)
32+
else(MSVC)
33+
add_compile_options(-fexceptions)
34+
endif(MSVC)
35+
36+
if(IGC_BUILD AND MSVC)
37+
Set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IGC_BUILD__TOOLS_OUTPUT_DIR})
38+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IGC_BUILD__TOOLS_OUTPUT_DIR})
39+
endif(IGC_BUILD AND MSVC)
40+
3041
add_executable(IGA_EXE ${IGA_EXE_CPP} ${IGA_EXE_HPP})
3142
if(MSVC_GENERATOR)
3243
# Due to all files being built in same directory (see upper-level cmake)
@@ -67,6 +78,25 @@ else()
6778
set(IGA_EXE_LINK_FLAGS "")
6879
endif()
6980

81+
if(IGC_BUILD)
82+
if (MSVC)
83+
# Set up standard defines from the common WDK path.
84+
# Without calling bs_set_wdk(), we might be getting these errors randomly between builds
85+
# error MSB4064: The "SpectreMitigation" parameter is not supported by the "CL" task.
86+
# error MSB4063: The "CL" task could not be initialized with its input parameters.
87+
bs_set_wdk(IGA_EXE)
88+
add_custom_command( TARGET IGA_EXE
89+
POST_BUILD
90+
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_FILE:IGA_EXE> $<TARGET_FILE_DIR:IGA_DLL>
91+
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_PDB_FILE:IGA_EXE> $<TARGET_FILE_DIR:IGA_DLL>
92+
)
93+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "")
94+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "")
95+
elseif (UNIX)
96+
install(TARGETS IGA_EXE DESTINATION ${IGC_INSTALL_TIME_ROOT_DIR}/bin COMPONENT igc-media)
97+
endif (MSVC)
98+
endif(IGC_BUILD)
99+
70100
# Set release build specific defines
71101
set_target_properties( IGA_EXE PROPERTIES
72102
OUTPUT_NAME "iga${TARGET_MODIFIER}"

0 commit comments

Comments
 (0)