Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
reneX
iMSTK
Commits
dd1b6936
Commit
dd1b6936
authored
Dec 03, 2019
by
Aaron Bray
Browse files
g3logger on *nix is not postfixing
parent
3956cac7
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMake/External/External_g3log.cmake
View file @
dd1b6936
...
...
@@ -2,12 +2,10 @@
# Add External Project
#-----------------------------------------------------------------------------
set
(
pre
"lib"
)
set
(
ext
"a"
)
if
(
MSVC
)
set
(
pre
""
)
set
(
ext
"lib"
)
set
(
config_dir
"$(Configuration)"
)
set
(
g3log_built_library
${
g3log_BINARY_DIR
}
/$
(
Configuration
)
/g3logger$<$<CONFIG:Debug>:d>.lib
)
else
(
)
set
(
g3log_built_library
${
g3log_BINARY_DIR
}
/libg3logger.a
)
endif
()
include
(
imstkAddExternalProject
)
...
...
@@ -19,7 +17,7 @@ imstk_add_external_project( g3log
-DADD_FATAL_EXAMPLE:BOOL=OFF
INSTALL_COMMAND
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
g3log_SOURCE_DIR
}
/src/g3log
${
CMAKE_INSTALL_PREFIX
}
/include/g3log
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
g3log_
BINARY_DIR
}
/
${
config_dir
}
/
${
pre
}
g3logger$<$<CONFIG:Debug>:d>.
${
ext
}
${
CMAKE_INSTALL_PREFIX
}
/lib/
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
g3log_
built_library
}
${
CMAKE_INSTALL_PREFIX
}
/lib/
RELATIVE_INCLUDE_PATH
"src"
DEPENDENCIES
""
#VERBOSE
...
...
CMakeLists.txt
View file @
dd1b6936
...
...
@@ -13,7 +13,7 @@ include(CTest)
#-----------------------------------------------------------------------------
# Set a default build type if none was specified
#-----------------------------------------------------------------------------
if
(
NOT CMAKE_BUILD_TYPE
)
if
(
NOT CMAKE_BUILD_TYPE
AND NOT CMAKE_CONFIGURATION_TYPES
)
message
(
STATUS
"Setting build type to 'Release' as none was specified."
)
set
(
CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build."
FORCE
)
endif
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment